12/12 已完成单据 详情优化

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -169,6 +169,8 @@ public class CollectOrderBizResponse {
     private Integer fifoSplit;
     private Integer billNo;
 
+    private String packUnit;
+
 //    /**
 //     * 未赋码数量
 //     */

src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java

@@ -17,9 +17,11 @@ import com.glxp.api.entity.collect.*;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoSplitFifoCodeEntity;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.IoCollectCodeRequest;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectCodeResponse;
 import com.glxp.api.res.inout.AddEnterCodeResponse;
 import com.glxp.api.res.inout.VailCodeResultResponse;
@@ -229,11 +231,14 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
         //已经校验码表
         List<IoCollectOrderCheckCode> ioCollectOrderCheckCodes = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper<IoCollectOrderCheckCode>().eq(IoCollectOrderCheckCode::getBillNo, filterCodeRequest.getBillNo()));
         List<IoCollectOrderBizBackup> ioCollectOrderBizBackups = ioCollectOrderBizBackupService.listByBillNo(filterCodeRequest.getBillNo());
-        for (IoCollectOrderBizBackup ioCollectOrderBizBackup : ioCollectOrderBizBackups) {
+        CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
-            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(ioCollectOrderBizBackup.getNameCode());
+        collectOrderBizRequest.setOrderIdFk(filterCodeRequest.getBillNo());
+        List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
+        for (CollectOrderBizResponse collectOrderBizResponse : list) {
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
             Integer checkCount = ioCollectOrderCheckCodeService.getCountByRelIdAndBillNo(udiRelevanceResponse.getId(), filterCodeRequest.getBillNo());
-            if (checkCount != ioCollectOrderBizBackup.getScanCount()) {
+            if (checkCount != collectOrderBizResponse.getScanActCount()) {
-                return ResultVOUtils.error(500, ioCollectOrderBizBackup.getCpmctymc() + "追溯码未校验");
+                return ResultVOUtils.error(500, udiRelevanceResponse.getCpmctymc() + "追溯码未校验完成");
             }
         }
 

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml

@@ -6,6 +6,7 @@
         SELECT icobb.*,
         bp.nameCode                   diCode,
         bp.zczbhhzbapzbh,
+        bp.packUnit,
         bp.manufactory,
         COALESCE(bp.bzgg,bp.ggxh) AS spec
         FROM io_collect_order_biz_backup icobb