出入库扫码相关bug修改

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -98,6 +98,10 @@ public class UdiRelevanceController extends BaseController {
         }
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
 
+        if(StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())){
+            filterUdiRelRequest.setNameCode(FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()).getUdi());
+        }
+
         if (StrUtil.isNotEmpty(filterUdiRelRequest.getBindRlIds())) {
             String[] datas = filterUdiRelRequest.getBindRlIds().split(",");
             List<String> list = Arrays.asList(datas);

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

@@ -622,6 +622,7 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setWarehouseCode(addOrderRequest.getCurSpaceCode());
             codeEnttity.setPreSpaceCode(addOrderRequest.getPreCurSpaceCode());
             codeEnttity.setPreInSpaceCode(addOrderRequest.getCheckPreInSpaceCode());
+            codeEnttity.setRelId(addOrderRequest.getRelId());
             codeEnttity.setCount(1);
             String unitFk = null;
             if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
@@ -946,10 +947,10 @@ public class IoCodeTempController extends BaseController {
 
         List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectAllByNameCode(codeEnttity.getNameCode(), unitFk);
         if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && codeEnttity.getRelId() == null) {//同一个DI绑定多个产品西信息
-            codeEnttity.setRelId(null);
-            codeEnttity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
-            codeTempService.insert(codeEnttity);
-            codeEnttity = codeTempService.findByUnique(codeEnttity.getOrderId(), codeEnttity.getCode());
+//            codeEnttity.setRelId(null);
+//            codeEnttity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
+//            codeTempService.insert(codeEnttity);
+//            codeEnttity = codeTempService.findByUnique(codeEnttity.getOrderId(), codeEnttity.getCode());
             BaseResponse baseResponse = ResultVOUtils.error(502, "DI绑定多个产品ID,请指定对应产品");
             baseResponse.setData(codeEnttity);
             return baseResponse;

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

@@ -438,7 +438,7 @@ public class IoOrderController extends BaseController {
     @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
         IoOrderEntity orderEntity = orderService.findByBillNo(deleteRequest.getBillNo());
-        if (orderEntity.getStatus() != 1 && orderEntity.getStatus() != 3 && orderEntity.getStatus() != 4 && orderEntity.getStatus() != 6) {
+        if (orderEntity.getStatus() != 1 && orderEntity.getStatus() != 3 && orderEntity.getStatus() != 4 && orderEntity.getStatus() != 6 && orderEntity.getStatus() != 10) {
             return ResultVOUtils.error(500, "单据已提交无法删除！");
         }
         orderService.deleteByBillNo(deleteRequest.getBillNo());

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

@@ -29,6 +29,7 @@ public class AddOrderRequest {
     private String remark;
     private String checkPreInOrders;
     private String selectSupId;
+    private Long relId;
 
     //    预验收货位
     private String checkPreInSpaceCode;

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

@@ -334,6 +334,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) {
 
                     InvPreInProductDetailEntity invProductDetailEntity = invPreinProductDetailService.selectByCode(billNo, code);
+                    if (invProductDetailEntity != null) {
                         int count = invProductDetailEntity.getCount() - 1;
                         int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         if (count == 0) {
@@ -357,9 +358,12 @@ public class IoOrderServiceImpl implements IoOrderService {
                             invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                         }
                         invPreinProductService.update(invProductEntity);
+                    }
+
 
                 } else if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) {  //寄售库存
                     InvPreProductDetailEntity invProductDetailEntity = invPreProductDetailService.selectByCode(billNo, code);
+                    if (invProductDetailEntity != null) {
                         int count = invProductDetailEntity.getCount() - 1;
                         int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         if (count == 0) {
@@ -383,8 +387,12 @@ public class IoOrderServiceImpl implements IoOrderService {
                             invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                         }
                         invPreProductService.update(invProductEntity);
+                    }
+
                 } else {   //普通库存
                     InvProductDetailEntity invProductDetailEntity = invProductDetailService.selectByCode(billNo, code);
+
+                    if (invProductDetailEntity != null) {
                         int count = invProductDetailEntity.getCount() - 1;
                         int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
                         if (count == 0) {
@@ -409,6 +417,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                         }
                         invProductService.update(invProductEntity);
                     }
+                }
 
 
             }

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -20,6 +20,7 @@ import com.glxp.api.res.inv.InvProductDetailResponse;
 import com.glxp.api.service.auth.InvSpaceService;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.IntUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -64,9 +65,14 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
     public InvProductDetailEntity selectByCode(String billNo, String code) {
         List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.selectList
                 (new QueryWrapper<InvProductDetailEntity>().eq("code", code).eq("orderId", billNo));
-        if (CollUtil.isNotEmpty(invProductDetailEntities))
+        if (CollUtil.isNotEmpty(invProductDetailEntities)) {
+            for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
+                if (IntUtil.value(invProductDetailEntity.getReCount()) > 0) {
+                    return invProductDetailEntity;
+                }
+            }
             return invProductDetailEntities.get(0);
-        else
+        } else
             return null;
     }