1.保存代码

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountCodesDao.java

@@ -47,7 +47,7 @@ public interface InvCountCodesDao {
      * @param orderIdFk
      * @return
      */
-    Long countByOrderIdFk(@Param("orderIdFk") Integer orderIdFk);
+    Long countByOrderIdFk(@Param("orderIdFk") String orderIdFk);
 
     /**
      * 根据单据号统计条码数量

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java

@@ -48,7 +48,7 @@ public interface InvCountOrderDetailDao {
      * @param orderIdFk
      * @return
      */
-    Long countByOrderIdFk(@Param("orderIdFk") Integer orderIdFk);
+    Long countByOrderIdFk(@Param("orderIdFk") String orderIdFk);
 
     /**
      * 查询盘点单据详情

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java

@@ -36,7 +36,7 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
 
     @Override
     public List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest) {
-        if (null != codesRequest) {
+        if (null == codesRequest) {
             return Collections.emptyList();
         }
         if (null != codesRequest.getPage() && null != codesRequest.getLimit()) {

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -93,12 +93,12 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "单据已提交，请勿重复提交");
         }
         //查询单据详情和码表是否存在，如果无单据详情和条码，不允许提交
-        Long detailCount = invCountOrderDetailDao.countByOrderIdFk(invCountOrder.getId());
+        Long detailCount = invCountOrderDetailDao.countByOrderIdFk(invCountOrder.getOrderId());
         if (detailCount == 0) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "请先选择盘点产品");
         }
 
-        Long codesCount = invCountCodesDao.countByOrderIdFk(invCountOrder.getId());
+        Long codesCount = invCountCodesDao.countByOrderIdFk(invCountOrder.getOrderId());
         if (codesCount == 0) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "请扫描需要盘点的产品");
         }
@@ -109,5 +109,4 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         return ResultVOUtils.success();
     }
 
-
 }

scripts/盘点功能表.sql

@@ -34,8 +34,8 @@ CREATE TABLE `inv_count_order_detail`  (
                                            `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '盘点单号',
                                            `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID',
                                            `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
-                                           `produceDate` datetime(0) NULL DEFAULT NULL COMMENT '生产日期',
-                                           `expireDate` datetime(0) NULL DEFAULT NULL COMMENT '失效日期',
+                                           `produceDate` varchar(255) NULL DEFAULT NULL COMMENT '生产日期',
+                                           `expireDate` varchar(255) NULL DEFAULT NULL COMMENT '失效日期',
                                            `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
                                            `countNum` int(0) NULL DEFAULT NULL COMMENT '盘点数量',
                                            `invNum` int(0) NULL DEFAULT NULL COMMENT '账面数量',
@@ -70,3 +70,7 @@ SET FOREIGN_KEY_CHECKS = 1;
 # 库存详情表添加货位号字段
 ALTER TABLE `udiwms`.`inv_product_detail`
     ADD COLUMN `invSpaceCode` varchar(255) NULL COMMENT '货位号' AFTER `invWarehouseCode`;
+
+ALTER TABLE `udiwms`.`inv_count_order_detail`
+    MODIFY COLUMN `produceDate` varchar(255) NULL DEFAULT NULL COMMENT '生产日期' AFTER `batchNo`,
+    MODIFY COLUMN `expireDate` varchar(255) NULL DEFAULT NULL COMMENT '失效日期' AFTER `produceDate`;