diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
index 7cedc9e0..74b2bec9 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
@@ -407,7 +407,7 @@ public class InProduceBackController extends BaseController {
         List<WmsInProduceBackItem> list = inProduceBackItemService.getList(id);
         list.forEach(it -> it.setNum(null));
         Map<String, String> base = new HashMap<>();
-        base.put("title", "生产订单退料单");
+        base.put("title", "生产退料单");
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
         Map<String, Object> variables = new HashMap<>();
@@ -428,7 +428,7 @@ public class InProduceBackController extends BaseController {
 //        order.setNo(order.getTicketNo());
         List<InProduceBackTicketItemVO> list = inProduceBackTicketItemService.getList(id);
         Map<String, String> base = new HashMap<>();
-        base.put("title", "生产订单退料单");
+        base.put("title", "生产退料单");
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
         Map<String, Object> variables = new HashMap<>();
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
index 6a9c739d..7c713bc5 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
@@ -580,6 +580,7 @@ public class OutCostCenterController extends BaseController {
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
+        base.put("title", "成本中心领料单");
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
@@ -602,6 +603,7 @@ public class OutCostCenterController extends BaseController {
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
+        base.put("title", "成本中心领料出库单");
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
index f7309e16..a4f1ac74 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
@@ -717,7 +717,7 @@ public class OutProduceController extends BaseController {
 //            list.add(new WmsOutProduceItem().setMatnr(RandomUtil.randomNumbers(10)));
 //        }
         Map<String, String> base = new HashMap<>();
-        base.put("title", order.getDataType() == 0 ? "生产订单领料单" : "成品发货领料单");
+        base.put("title", order.getDataType() == 0 ? "生产领料单" : "成品发货领料单");
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
         Map<String, Object> variables = new HashMap<>();
@@ -745,6 +745,7 @@ public class OutProduceController extends BaseController {
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
+        base.put("title", "生产补料单");
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
@@ -767,6 +768,7 @@ public class OutProduceController extends BaseController {
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
+        base.put("title", "生产补料出库单");
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
@@ -787,7 +789,7 @@ public class OutProduceController extends BaseController {
         List<OutProduceInfoItemVO> list = outProduceTicketItemService.getList(id);
         list.forEach(it -> it.setAufnr(order.getAufnr()));
         Map<String, String> base = new HashMap<>();
-        base.put("title", order.getDataType() == 0 ? "生产订单发料单" : "成品发货出库单");
+        base.put("title", order.getDataType() == 0 ? "生产领料出库单" : "成品发货出库单");
         base.put("createDate", DateUtil.format(order.getCreateTime(), "yyyy-MM-dd"));
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         Map<String, Object> variables = new HashMap<>();
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
index 58f7a66c..70b73b17 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
@@ -69,7 +69,6 @@ public class QrCodeMasterController extends BaseController {
     @PostMapping("search")
     @ApiMark(moduleName = "获取二维码详细信息", apiName = "获取二维码详细信息")
     public ApiResult<PageData<QrCodeItemVO>> search(@Valid @RequestBody QrCodeItemSearchQO request) {
-
         return ApiResult.success(qrCodeMasterService.search(request));
     }
 
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
index 454c38bc..d1126cdb 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
@@ -161,7 +161,7 @@ public class StructuralPackageOrderController extends BaseController {
                 )
                 .toList();
         if (Objects.equals(request.getType(), 2)
-                || Objects.equals(request.getType(), 4) ) {
+                || Objects.equals(request.getType(), 4)) {
             datas.forEach(it -> {
                 it.setBatchNo(NoUtil.getBatchNo(it.getSupplierNo()));
             });
@@ -303,14 +303,18 @@ public class StructuralPackageOrderController extends BaseController {
             List<WmsStructuralPackage> packages = structuralPackageService.lambdaQuery()
                     .in(WmsStructuralPackage::getId, request.getItems().stream().map(PackageDeliverOrderSaveItemQO::getPackageId).toList())
                     .list();
+            List<UserSupplier> suppliers = userSupplierService.listByIds(ordersForAdd.stream().map(WmsStructuralPackageOrder::getSupplierId).collect(Collectors.toSet()));
             qrCodeMasterService.saveBatch(
                     ordersForAdd.stream()
-                            .filter(it -> Objects.isNull(it.getId()))
                             .map(it -> {
                                 WmsStructuralPackage p = packages.stream()
                                         .filter(pt -> pt.getId().equals(it.getPackageId()))
                                         .findFirst()
                                         .get();
+                                UserSupplier supplier = suppliers.stream()
+                                        .filter(pt -> pt.getId().equals(it.getSupplierId()))
+                                        .findFirst()
+                                        .get();
                                 return new WmsQrCodeMaster()
                                         .setBarcodeCode(KeyUtil.next())
                                         .setProcessStage(BarCodeProcessStage.Unpackaged.getState())
@@ -324,6 +328,9 @@ public class StructuralPackageOrderController extends BaseController {
                                         .setPoNumber(it.getExternalOrderNo())
                                         .setPoLineNumber(it.getRowNo())
                                         .setExtendId(it.getId())
+                                        .setSupplierId(it.getSupplierId())
+                                        .setSupplierCode(supplier.getSupplierCode())
+                                        .setSupplierName(supplier.getSupplierName())
                                         .setCreateUserId(UserUtil.getUserId())
                                         .setCreateUserName(UserUtil.getUserName())
                                         .setCreateTime(LocalDateTime.now());
@@ -504,17 +511,18 @@ public class StructuralPackageOrderController extends BaseController {
         List<DeliverStructuralPackageOrderTrayItemVO> list = structuralPackageOrderTrayItemService.getListVOByTrayId(id);
         List<DeliverStructuralPackageOrderTrayItemVO> datas = new ArrayList<>();
         for (DeliverStructuralPackageOrderTrayItemVO it : list) {
+            String code = Base62Util.encode(it.getId());
             for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
                 DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
-                vo.setQrCodeId(it.getId() + "-" + (i + 1));
-                vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
+                vo.setQrCodeId(code + "-" + (i + 1));
+                vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
                 vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
                 datas.add(vo);
             }
             if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
                 DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
-                vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1));
-                vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
+                vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1));
+                vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
                 vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
                 datas.add(vo);
             }
@@ -996,7 +1004,7 @@ public class StructuralPackageOrderController extends BaseController {
         VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空");
         BigDecimal num = BigDecimal.valueOf(order.getNum());
         OptRecordDTO optRecordDTO1 = new OptRecordDTO();
-        optRecordDTO1.setOperationType((short)1);
+        optRecordDTO1.setOperationType((short) 1);
         optRecordDTO1.setOrderId(order.getOrderNo());
         optRecordService.add(optRecordDTO1);
         Pair<Pair<String, String>, Pair<String, String>> pair = sapService.zwm3a17(new ZWM3A17DTO()
@@ -1023,7 +1031,7 @@ public class StructuralPackageOrderController extends BaseController {
         );
         if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) {
             OptRecordDTO optRecordDTO = new OptRecordDTO();
-            optRecordDTO.setOperationType((short)1);
+            optRecordDTO.setOperationType((short) 1);
             optRecordDTO.setOrderId(order.getOrderNo());
             optRecordService.add(optRecordDTO);
             sapService.zwm3a18(new ZWM3A18DTO()
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
index 4246fab2..d5c548ff 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
@@ -83,6 +83,7 @@ public class MaterialControllerService {
         VUtil.trueThrowBusinessError(Objects.nonNull(old) && !old.getComplete())
                 .throwMessage("该物料存在草稿版本");
         WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
+        wmsMaterial.setVersion(1);
         wmsMaterial.setCreateBy(UserUtil.getUserName());
         wmsMaterial.setCreateTime(LocalDateTime.now());
         materialService.add(wmsMaterial);
diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
index b6040b54..e4b66c6c 100644
--- a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
+++ b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
@@ -48,7 +48,7 @@
         <td rowspan="4" style="text-align: center;">
             <img class="qrcode" alt="" th:src="${info.qrCode}"/>
         </td>
-        <td style="width: 13mm;">
+        <td style="width: 15mm;">
             采购单号:
         </td>
         <td style="width: 23mm;" th:text="${info.externalOrderNo}">
diff --git a/nflg-wms-admin/src/main/resources/template/成本中心领料单.html b/nflg-wms-admin/src/main/resources/template/成本中心领料单.html
index 998ddac5..b7385c0f 100644
--- a/nflg-wms-admin/src/main/resources/template/成本中心领料单.html
+++ b/nflg-wms-admin/src/main/resources/template/成本中心领料单.html
@@ -139,7 +139,7 @@
         </div>
         <div>
             <div class="company-name">福建南方路面机械股份有限公司</div>
-            <div class="title">部门领料单</div>
+            <div class="title" th:text="${base.title}">部门领料单</div>
         </div>
     </div>
     <div class="table-desc">
diff --git a/nflg-wms-admin/src/main/resources/template/生产补料单.html b/nflg-wms-admin/src/main/resources/template/生产补料单.html
index 954b63b0..01fec4e9 100644
--- a/nflg-wms-admin/src/main/resources/template/生产补料单.html
+++ b/nflg-wms-admin/src/main/resources/template/生产补料单.html
@@ -166,7 +166,7 @@
         <div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
         <div>
             <div class="company-name">福建南方路面机械股份有限公司</div>
-            <div class="title">补 料 单</div>
+            <div class="title" th:text="${base.title}">生产补料单</div>
         </div>
     </div>
     <div class="table-desc">
diff --git a/nflg-wms-admin/src/main/resources/template/生产退料单.html b/nflg-wms-admin/src/main/resources/template/生产退料单.html
index f90a577f..bec2cf61 100644
--- a/nflg-wms-admin/src/main/resources/template/生产退料单.html
+++ b/nflg-wms-admin/src/main/resources/template/生产退料单.html
@@ -166,7 +166,7 @@
         <div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
         <div>
             <div class="company-name">福建南方路面机械股份有限公司</div>
-            <div class="title" th:text="${base.title}">生产订单退料单</div>
+            <div class="title" th:text="${base.title}">生产退料单</div>
         </div>
     </div>
     <div class="table-desc">
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java
index 18b882f1..b4ae6577 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java
@@ -3,7 +3,7 @@ package com.nflg.wms.common.pojo.qo;
 import lombok.Data;
 
 @Data
-public class GongZhuangTaiZhangSearchQO extends PageQO {
+public class GongZhuangTaiZhangSearchQO extends SearchBaseQO {
 
     /**
      * 工装编号
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java
index 95c63232..66b43054 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java
@@ -25,5 +25,5 @@ public class InventoryCheckTaskSaveItemQO {
      * 盘点负责人id
      */
     @NotNull
-    private Integer chargeUserId;
+    private Long chargeUserId;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
index 3076370b..09469b2d 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
@@ -2,8 +2,6 @@ package com.nflg.wms.common.pojo.qo;
 
 import lombok.Data;
 
-import java.time.LocalDate;
-
 @Data
 public class MaterialCodeSearchQO extends SearchBaseQO {
 
@@ -36,4 +34,9 @@ public class MaterialCodeSearchQO extends SearchBaseQO {
      * 下单结束日期
      */
     private String orderEndDate;
+
+    /**
+     * 状态，0：未开始；1：打包中；2：已完成
+     */
+    private Integer status;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java
index 3f34085d..9b9c6ee8 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java
@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -12,6 +13,6 @@ public class PackingDelQO {
     /**
      * 包装箱id
      */
-    @NotNull
+    @NotEmpty
     private List<Long> id;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java
index 2f56bac7..f4228824 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java
@@ -3,10 +3,15 @@ package com.nflg.wms.common.pojo.qo;
 import lombok.Data;
 
 @Data
-public class ToolMaterialSearchQO extends PageQO{
+public class ToolMaterialSearchQO extends SearchBaseQO{
 
     /**
      * 物料号
      */
     private String no;
+
+    /**
+     * 工具名称
+     */
+    private String name;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java
index d1e7524a..a9542ef4 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java
@@ -67,7 +67,7 @@ public class InventoryCheckTaskItemVO {
     /**
      * 盘点负责人id
      */
-    private Integer chargeUserId;
+    private Long chargeUserId;
 
     /**
      * 所在地点
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java
new file mode 100644
index 00000000..4ef71153
--- /dev/null
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java
@@ -0,0 +1,23 @@
+package com.nflg.wms.common.util;
+
+public class Base62Util {
+
+    private static final String BASE62_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    private static final int BASE = 62;
+
+    /**
+     * 将 long 类型数字编码为 Base62 字符串
+     */
+    public static String encode(long num) {
+        if (num == 0) {
+            return String.valueOf(BASE62_CHARS.charAt(0));
+        }
+        StringBuilder sb = new StringBuilder();
+        while (num > 0) {
+            int remainder = (int) (num % BASE);
+            sb.append(BASE62_CHARS.charAt(remainder));
+            num = num / BASE;
+        }
+        return sb.reverse().toString();
+    }
+}
\ No newline at end of file
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java
index 47354dc9..44923a97 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java
@@ -47,5 +47,5 @@ public class WmsInventoryCheckTaskItem implements Serializable {
     /**
      * 盘点负责人id
      */
-    private Integer chargeUserId;
+    private Long chargeUserId;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
index 7edcb368..d37e74bc 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -66,6 +67,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
     @Override
     public IPage<WmsGongzhuangTaizhang> search(GongZhuangTaiZhangSearchQO request) {
         return lambdaQuery()
+                .ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate())
+                .le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate())
                 .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
                 .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
                 .orderByDesc(WmsGongzhuangTaizhang::getId)
@@ -75,6 +78,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
     @Override
     public List<WmsGongzhuangTaizhang> searchAll(GongZhuangTaiZhangSearchQO request) {
         return lambdaQuery()
+                .ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate())
+                .le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate())
                 .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
                 .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
                 .list();
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
index faa8de91..9966bec4 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
@@ -10,6 +10,7 @@ import com.nflg.wms.common.pojo.qo.ToolMaterialAddQO;
 import com.nflg.wms.common.pojo.qo.ToolMaterialSearchQO;
 import com.nflg.wms.common.pojo.qo.ToolMaterialUpdateQO;
 import com.nflg.wms.common.util.UserUtil;
+import com.nflg.wms.repository.entity.WmsGongzhuangTaizhang;
 import com.nflg.wms.repository.entity.WmsToolMaterial;
 import com.nflg.wms.repository.entity.WmsToolMaterialCheck;
 import com.nflg.wms.repository.entity.WmsToolMaterialMaintain;
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -62,7 +64,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
     @Override
     public IPage<WmsToolMaterial> search(ToolMaterialSearchQO request) {
         return lambdaQuery()
+                .ge(Objects.nonNull(request.getStartDate()), WmsToolMaterial::getCreateTime, request.getStartDate())
+                .le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate())
                 .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
+                .like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName())
                 .orderByDesc(WmsToolMaterial::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
@@ -85,7 +90,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
     @Override
     public List<WmsToolMaterial> searchAll(ToolMaterialSearchQO request) {
         return lambdaQuery()
+                .ge(Objects.nonNull(request.getStartDate()),WmsToolMaterial::getCreateTime, request.getStartDate())
+                .le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate())
                 .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
+                .like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName())
                 .list();
     }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
index cb8ee5eb..3775467c 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
@@ -40,10 +40,10 @@
                 and a.supplier_id = #{request.supplierId}
             </if>
             <if test="request.startDate !=null">
-                and a.create_time>= #{request.inStartDate}
+                and a.create_time>= #{request.startDate}
             </if>
             <if test="request.endDate !=null">
-                and a.create_time &lt;= #{request.inEndDate}
+                and a.create_time &lt;= #{request.endDate}
             </if>
         </where>
         order by a.package_type asc, a.create_time desc
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
index 0bd50d0b..942253c3 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
@@ -43,10 +43,10 @@
             and a.material_code  =#{ request.materialCode}
         </if>
         <if test="request.startDate !=null">
-            and a.create_time>= #{request.inStartDate}
+            and a.create_time>= #{request.startDate}
         </if>
         <if test="request.endDate !=null">
-            and a.create_time &lt;= #{request.inEndDate}
+            and a.create_time &lt;= #{request.endDate}
         </if>
 <!--        group by a.id, a.barcode_code, a.barcode_type, a.process_stage, a.material_code, a.material_description,-->
 <!--                 a.packaging_type, a.unit, a.batch_no, a.serial_no, a.supplier_code, d.supplier_name, a.po_number,-->
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
index ac884c84..08c8babb 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
@@ -64,10 +64,10 @@
                 and a.purchase_group =#{ request.purchaseGroup}
             </if>
             <if test="request.startDate !=null">
-                and a.approve_time>= #{request.inStartDate}
+                and a.approve_time>= #{request.startDate}
             </if>
             <if test="request.endDate !=null">
-                and a.approve_time &lt;= #{request.inEndDate}
+                and a.approve_time &lt;= #{request.endDate}
             </if>
         </select>
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml
index 50a5b561..3f42da7f 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml
@@ -31,10 +31,10 @@
                 and a.storage_location = #{request.storageLocation}
             </if>
             <if test="request.startDate !=null">
-                and a.create_time>= #{request.inStartDate}
+                and a.create_time>= #{request.startDate}
             </if>
             <if test="request.endDate !=null">
-                and a.create_time &lt;= #{request.inEndDate}
+                and a.create_time &lt;= #{request.endDate}
             </if>
         </where>
         order by a.create_time DESC
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
index 023230d0..d867fe49 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
@@ -153,6 +153,7 @@ public class MaterialCodeController extends BaseController {
     public ApiResult<PageData<WmsShipmentMaterialCode>> search(@Valid @RequestBody MaterialCodeSearchQO request) {
         return ApiResult.success(
                 materialCodeService.lambdaQuery()
+                        .eq(Objects.nonNull(request.getStatus()),WmsShipmentMaterialCode::getStatus, request.getStatus())
                         .ge(Objects.nonNull(request.getOrderStartDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderStartDate())
                         .le(Objects.nonNull(request.getOrderEndDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderEndDate())
                         .ge(Objects.nonNull(request.getStartDate()), WmsShipmentMaterialCode::getCreateTime, request.getStartDate())