3/11 选入已完成单据 修改1.0

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -134,6 +134,10 @@ public class IoCodeTempController extends BaseController {
     @Autowired
     IoSplitFifoCodeService ioSplitFifoCodeService;
 
+    @Autowired
+    IoCollectOrderCodeManService collectOrderCodeManService;
+
+
 
     /**
      * PDA-----单据上传
@@ -1045,10 +1049,14 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 //计算实际数量
-                if (bussinessTypeEntity.isUse()) {
+                if (addOrderRequest.getScanActCount() != null){
-                    codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                    codeEnttity.setReCount(addOrderRequest.getScanActCount());
-                } else {
+                }else {
-                    codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                    if (bussinessTypeEntity.isUse()) {
+                        codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                    } else {
+                        codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                    }
                 }
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
@@ -2911,6 +2919,11 @@ public class IoCodeTempController extends BaseController {
                 }
 
             } else {
+//                IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(orderFinishBillNo);
+                IoCollectOrderCodeMan one = collectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
+                        .eq(IoCollectOrderCodeMan::getOrderIdFk, orderFinishBillNo)
+                        .eq(IoCollectOrderCodeMan::getUdiCode, code));
+                addOrderRequest.setScanActCount(one.getScanActCount());
                 baseResponse = addMaterOrder(addOrderRequest, udiEntity, code,groupNumber);
             }
 

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -71,5 +71,10 @@ public class AddOrderRequest {
     @TableField(value = "fifoSplitTag")
     private Integer fifoSplitTag;
 
+    /**
+     * 选入已经完成单据的实际数量
+     */
+    private Integer scanActCount;
+
 
 }