4/9 优化1.0

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

@@ -65,6 +65,7 @@ public class IoCollectOrderController extends BaseController {
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
+
     @PostMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
@@ -406,6 +407,7 @@ 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());
@@ -436,6 +438,9 @@ 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,8 +64,6 @@ public class IoCollectOriginController extends BaseController {
     @Resource
     IoCollectOrderBizOriginService collectOrderBizOriginService;
     @Resource
-    SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
-    @Resource
     SysWorkplaceDocumentService sysWorkplaceDocumentService;
     @Resource
     private ErpBasicClient erpBasicClient;