单据管理相关功能修改

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

@@ -461,9 +461,6 @@ public class IoCodeTempController extends BaseController {
         }
 
 
-        //校验库存是否存在
-
-
         if (addOrderRequest.getFromCorp() == null) {
             BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp());
             if (basicCorpEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
@@ -802,28 +799,34 @@ public class IoCodeTempController extends BaseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/addCode/updateBindSup")
-    public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity warehouseEntity, BindingResult bindingResult) {
+    public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeTempEntity, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (StrUtil.isNotEmpty(warehouseEntity.getMySupId())) {
+
-            warehouseEntity.setSupId(warehouseEntity.getMySupId());
+        if (StrUtil.isNotEmpty(codeTempEntity.getSupId())) {
-            codeTempService.updateById(warehouseEntity);
+            codeTempEntity.setSupId(codeTempEntity.getSupId());
-        } else if (warehouseEntity.getRelId() != null) {
+            codeTempService.updateById(codeTempEntity);
-            warehouseEntity = codeTempService.selectById(warehouseEntity.getId());
+        } else if (codeTempEntity.getRelId() != null) {
-            int reCount = udiCalCountUtil.getActCount(warehouseEntity);
+            codeTempEntity = codeTempService.selectById(codeTempEntity.getId());
-            warehouseEntity.setReCount(reCount);
+            int reCount = udiCalCountUtil.getActCount(codeTempEntity);
-            codeTempService.updateById(warehouseEntity);
+            codeTempEntity.setReCount(reCount);
-            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(warehouseEntity.getAction());
+            codeTempService.updateById(codeTempEntity);
-            BaseResponse baseResponse = checkSupId(bussinessTypeEntity, warehouseEntity, warehouseEntity.getSupId());
+            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction());
+            BaseResponse baseResponse = checkSupId(bussinessTypeEntity, codeTempEntity, codeTempEntity.getSupId());
             if (baseResponse != null)
                 return baseResponse;
         }
+        codeTempEntity = codeTempService.selectById(codeTempEntity.getId());
+        IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
+        ioAddInoutService.genOrderDetailCode(orderEntity, codeTempEntity);
+
         return ResultVOUtils.success("绑定成功");
     }
 
-
+    @Resource
+    IoAddInoutService ioAddInoutService;
     @Resource
     IoOrderDetailCodeService ioOrderDetailCodeService;
 

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

@@ -125,7 +125,7 @@ public class IoOrderDetailBizController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/updateBizProduct")
     public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) {
-        boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId());
+        boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId(), orderDetailBizEntity.getOrderIdFk());
         if (isExit) {
             return ResultVOUtils.error(500, "存在相同产品，相同批次号，请检查后保存！");
         }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -105,6 +105,12 @@ public class IoCheckInoutService {
     }
 
     public String checkCode(IoCodeTempEntity codeEntity) {
+
+        boolean isBillExit = orderDetailBizService.isExit(codeEntity.getOrderId());
+        if (!isBillExit) {
+            return "请先录入业务详情";
+        }
+
         IoOrderDetailBizEntity bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo());
         if (bizEntity == null) {
             return "非此单产品!";

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -18,7 +18,9 @@ public interface IoOrderDetailBizService {
 
     int deleteByOrderId(String billNo);
 
-    boolean isExit(Long relId, String bacthNo, Integer ignoreId);
+    boolean isExit(String billNo);
+
+    boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId);
 
     IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -48,10 +48,15 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.delete(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", billNo));
     }
 
+    @Override
+    public boolean isExit(String billNo) {
+        return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk",billNo));
+    }
+
 
     @Override
-    public boolean isExit(Long relId, String bacthNo, Integer ignoreId) {
+    public boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId) {
-        return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("bindRlFk", relId).eq("batchNo", bacthNo).ne("id", ignoreId));
+        return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("bindRlFk", relId).eq("batchNo", bacthNo).eq("orderIdFk", orderId).ne("id", ignoreId));
     }
 
     @Override