库存不足修改

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java

@@ -291,7 +291,9 @@ public class OrderController {
         String receiveEnable = systemParamConfigService.selectValueByParamKey("sps_sync_review_order");
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
         StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
-
+        if (bussinessTypeEntity == null) {
+            return ResultVOUtils.error(500, "单据类型未找到");
+        }
         if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
             if (bussinessTypeEntity.isEntrutSpms() || (StrUtil.nullToEmpty(receiveEnable).equals("1"))) {
                 BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.glxp.api.admin.dao.business.InvSpaceDao;
 import com.glxp.api.admin.dao.inventory.InvProductDetailDao;
 import com.glxp.api.admin.entity.basic.UdiEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
+import com.glxp.api.admin.entity.inout.IoCodeLostEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.req.inventory.BindInvSpaceRequest;
@@ -18,6 +19,7 @@ import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse;
 import com.glxp.api.admin.res.inventory.InvProductDetailPlaceResponse;
 import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
+import com.glxp.api.admin.service.inout.IoCodeLostService;
 import com.glxp.api.admin.service.inventory.InvProductDetailService;
 import com.glxp.api.admin.util.FilterUdiUtils;
 import com.glxp.api.common.enums.ResultEnum;
@@ -171,20 +173,30 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         return null;
     }
 
+    @Resource
+    IoCodeLostService codeLostService;
+
     @Override
     public int vailStockCount(String code) {
         if (StrUtil.isEmpty(code)) {
             return 0;
         }
+
+        IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
+
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         UdiInfoEntity udiInfoEntity = getMinDi(code);
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+        if (codeLostEntity != null) {
+            udiEntity.setBatchNo(codeLostEntity.getBatchNo());
+            udiEntity.setExpireDate(codeLostEntity.getExpireDate());
+            udiEntity.setProduceDate(codeLostEntity.getProduceDate());
+        }
         if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
                 || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
             udiEntity.setUdi(udiInfoEntity.getNameCode());
             code = FilterUdiUtils.transGlxpNoSerStr(udiEntity);
         }
-
         filterInvProductDetailRequest.setOriginCode(null);
         filterInvProductDetailRequest.setCode(code);
         if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))