src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -65,7 +65,6 @@ public class IoCollectOrderController extends BaseController {
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
-
     @PostMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
@@ -407,7 +406,6 @@ public class IoCollectOrderController extends BaseController {
     public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
         List<String> billNos = new ArrayList<>();
         if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单号不能为空！");
-        SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.getOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, collectOrderRequest.getBusType()));
         IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderRequest.getBillNo());
         if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
             billNos = collectOrderService.getBillBySummary(collectOrder.getSummaryNo());
@@ -438,9 +436,6 @@ public class IoCollectOrderController extends BaseController {
                 }
             }
             if (!isAllTag) {
-                if (sysWorkplaceDocumentEntity.getCoercionSubmit() == 1){
-                    return ResultVOUtils.error(500, "该业务单据已经开启强制提交");
-                }
                 return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.replaceAll(";$", "") + "】,是否强制完成单据？");
             }
         }

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -64,6 +64,8 @@ public class IoCollectOriginController extends BaseController {
     @Resource
     IoCollectOrderBizOriginService collectOrderBizOriginService;
     @Resource
+    SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
+    @Resource
     SysWorkplaceDocumentService sysWorkplaceDocumentService;
     @Resource
     private ErpBasicClient erpBasicClient;

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

@@ -214,9 +214,6 @@ public class CollectOrderBizResponse {
 
     private Integer sumScanCount;
 
-
-    private Integer splitCount;
-
 //    /**
 //     * 未赋码数量
 //     */

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

@@ -18,11 +18,13 @@ import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.util.IntUtil;
 import com.ibm.icu.text.UFormat;
-import org.aspectj.weaver.ast.Var;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,9 +57,7 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         //设置 应该扫码数量 shouldCount
         if (data.size() > 0) {
             for (CollectOrderBizResponse collectOrderBizResponse : data) {
-                List<Integer> integers = setShouldCount(collectOrderBizResponse);
-                collectOrderBizResponse.setShouldCount(integers.get(0));
-                collectOrderBizResponse.setSplitCount(integers.get(1));
+                collectOrderBizResponse.setShouldCount(setShouldCount(collectOrderBizResponse));
                 if (collectOrderBizResponse.getScanCount() == null) {
                     collectOrderBizResponse.setScanCount(0);
                 }
@@ -216,8 +216,7 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         return data;
     }
 
-    public List<Integer> setShouldCount(CollectOrderBizResponse collectOrderBizResponse){
-        ArrayList<Integer> integers = new ArrayList<>();
+    public Integer setShouldCount(CollectOrderBizResponse collectOrderBizResponse){
         List<BasicProductsEntity> productList = basicProductsDao.selectList(
                 new LambdaQueryWrapper<BasicProductsEntity>()
                         .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm())
@@ -225,11 +224,13 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         BasicProductsEntity product = productList.get(0);
         Integer myBhxjsl = product.getBhxjsl();
         Integer shouldCount = 0;
-        int remainder = collectOrderBizResponse.getCount() % myBhxjsl;
         double quotient = (double) collectOrderBizResponse.getCount() / myBhxjsl;
         int integerPart = (int) quotient;
         if (quotient == integerPart) {
             if (integerPart == 0) {
+                if (collectOrderBizResponse.getAutoTagStatus() != 2) {
+                    shouldCount = 1;
+                }
             } else {
                 shouldCount = integerPart;
             }
@@ -237,11 +238,9 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
             if (IntUtil.value(collectOrderBizResponse.getAutoTagStatus()) == 2) {
                 shouldCount = 0;
             } else {
-                shouldCount = integerPart;
+                shouldCount = integerPart + 1;
             }
         }
-        integers.add(shouldCount);
-        integers.add(remainder);
-        return integers;
+        return shouldCount;
     }
 }