ms上传调整

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

@@ -12,22 +12,17 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
-import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.basic.*;
-import com.glxp.api.entity.basic.BasicCorpEntity;
-import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
 import com.glxp.api.entity.inout.PdaCodeEntity;
 import com.glxp.api.req.inout.PostOrderRequest;
 import com.glxp.api.req.udims.PostUdimsOrderRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
-import com.glxp.api.service.basic.BasicCorpService;
+import com.glxp.api.service.basic.*;
-import com.glxp.api.service.basic.IBasicBussinessTypeService;
-import com.glxp.api.service.basic.UdiRelevanceService;
-import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.CustomUtil;
@@ -36,6 +31,7 @@ import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
+import com.glxp.api.util.udi.UdiInfoUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -702,6 +698,9 @@ public class IoAddInoutService {
         return ioOrderDetailCodeEntity;
     }
 
+    @Resource
+    private UdiProductService udiProductService;
+
 
     /**
      * udims上传单据
@@ -745,6 +744,10 @@ public class IoAddInoutService {
                     for (int index = 0; index < msCodeEntities.size(); index++) {
                         IoCodeTempEntity codeEnttity = new IoCodeTempEntity();
                         BeanUtil.copyProperties(msCodeEntities.get(index), codeEnttity);
+                        UdiProductEntity uuid = udiProductService.findByNameCode(codeEnttity.getNameCode());
+                        if (uuid==null){
+                            throw new JsonException(500,"未找到对应耗材字典");
+                        }
                         codeEnttity.setAction(orderSaveRequest.getAction());
                         codeEnttity.setMainAction(orderSaveRequest.getMainAction());
                         codeEnttity.setDeptCode(orderSaveRequest.getDeptCode());