bug修改

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -99,8 +99,8 @@ public class StockQRCodeTextController {
         for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) {
             StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId());
             if (stockOrderDetailEntity != null) {
-                stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount()+"");
-                stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount()+"");
+                stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount() + "");
+                stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount() + "");
             } else {
                 stockQRCodeTextEntity.setCount("0");
                 stockQRCodeTextEntity.setReCount("0");
@@ -365,9 +365,10 @@ public class StockQRCodeTextController {
         List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
         if (list != null && list.size() > 0) {
             int index = 1;
+            CompanyEntity companyEntity = companyService.findCompany();
             for (StockOrderPrintEntity stockOrderPrintEntity : list) {
                 stockOrderPrintEntity.setIndex(index + "");
-                stockOrderPrintEntity.setTitle(stockOrderPrintEntity.getCorpName());
+                stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName());
 //                StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse();
 //                BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse);
 //                stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice());
@@ -375,7 +376,7 @@ public class StockQRCodeTextController {
 //                stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36));
 //                stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88));
 //                stockOrderPrintEntity.setTotalPriceWord("18888");
-//                stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName());
+                stockOrderPrintEntity.setTitle(companyEntity.getName());
                 stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
                 index++;
 //                stockOrderPrintResponses.add(stockOrderPrintResponse);

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
+import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
@@ -632,7 +633,21 @@ public class OrderDetailController {
         OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
         orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
         OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
-        transInoutService.repeatCheck(orderEntity.getId());
+
+        transInoutService.transStatus(orderEntity.getId());
+        orderEntity = orderService.findById(orderEntity.getId());
+        List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) {
+            if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID，则自动校验
+                transInoutService.repeatCheck(orderEntity.getId());
+            } else {
+                //未绑定Id,则更改状态，等待校验
+                orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                orderService.updateOrder(orderEntity);
+            }
+        }
+
         return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
     }
 

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java

@@ -9,6 +9,7 @@ import com.glxp.api.admin.entity.basic.UdiEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvProductEntity;
 import com.glxp.api.admin.req.inout.DeleteRequest;
@@ -21,10 +22,12 @@ import com.glxp.api.admin.res.inventory.InvProductDetailResponse;
 import com.glxp.api.admin.res.inventory.InvProductPageRespnonse;
 import com.glxp.api.admin.res.inventory.InvProductResponse;
 import com.glxp.api.admin.res.inventory.InvProductStatResponse;
+import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.admin.service.inout.OrderService;
+import com.glxp.api.admin.service.inout.WarehouseUserService;
 import com.glxp.api.admin.service.inventory.InvProductDetailService;
 import com.glxp.api.admin.service.inventory.InvProductService;
 import com.glxp.api.admin.util.FilterUdiUtils;
@@ -64,10 +67,25 @@ public class InvProductsController {
     private UdiInfoService udiInfoService;
     @Resource
     private CompanyService companyService;
+    @Resource
+    private WarehouseUserService warehouseUserService;
+    @Resource
+    CustomerService customerService;
 
     @GetMapping("spms/inv/products/filter")
     public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
         boolean showSup = false;
+        if (StrUtil.isEmpty(filterInvProductRequest.getInvStorageCode())) {
+            List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.selectCodeByUser(customerService.getUserId() + "");
+            if (!warehouseUserEntities.isEmpty()) {
+                List<String> invCodes = new ArrayList<>();
+                warehouseUserEntities.forEach(warehouseUserEntity -> {
+                    invCodes.add(warehouseUserEntity.getCode());
+                });
+                filterInvProductRequest.setInvCodes(invCodes);
+            }
+
+        }
         List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo;
         pageInfo = new PageInfo<>(invProductResponses);

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
@@ -14,6 +15,7 @@ import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse;
 import com.glxp.api.admin.res.inventory.InvWarehouseResponse;
 import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 import com.glxp.api.admin.service.auth.CustomerService;
+import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import com.glxp.api.admin.util.DateUtil;
 import com.glxp.api.admin.util.FileUtils;
@@ -43,6 +45,8 @@ public class InvWarehouseController {
     InvWarehouseService invWarehouseService;
     @Resource
     CustomerService customerService;
+    @Resource
+    SystemParamConfigService systemParamConfigService;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filter")
@@ -63,6 +67,34 @@ public class InvWarehouseController {
         return ResultVOUtils.success(invWarehouseEntities);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterAllLocInv")
+    public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setPid(0);
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
+        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
+        List<InvWarehouseEntity> temps = new ArrayList<>();
+        if (systemParamConfigEntity.getParamValue().equals("1")) {
+            for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
+                if (!invWarehouseEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) {
+                    temps.add(invWarehouseEntity);
+                }
+            }
+            return ResultVOUtils.success(temps);
+        } else {
+            InvWarehouseEntity curEntity = invWarehouseService.selectByCode(filterInvWarehouseRequest.getLocInvCode());
+            for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
+                if (!StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(invWarehouseEntity.getCode())) {
+                    temps.add(invWarehouseEntity);
+                } else if (!StrUtil.isEmpty(invWarehouseEntity.getPcode()) && invWarehouseEntity.getPcode().equals(curEntity.getCode())) {
+                    temps.add(invWarehouseEntity);
+                }
+            }
+            return ResultVOUtils.success(temps);
+        }
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterAllByUser")
     public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {

api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java

@@ -30,6 +30,8 @@ public interface WarehouseUserDao {
 
     List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
 
+    List<WarehouseUserEntity> selectCodeByUser(@Param("userId") String userId);
+
     void deleteByCode(@Param("code") String code);
 
     /**

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.admin.req.inventory;
 import com.glxp.api.admin.req.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class FilterInvProductRequest extends ListPageRequest {
 
@@ -33,5 +35,5 @@ public class FilterInvProductRequest extends ListPageRequest {
     //货位码
     private String invWarehouseCode;
     private String groupType;
-
+    private List<String> invCodes;
 }

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java

@@ -16,7 +16,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private Boolean isDefault;
     private Date updateTime;
     private String key;
-
+    private String locInvCode;
 
     private Integer level;
     private String pcode;

api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java

@@ -16,6 +16,8 @@ public interface WarehouseUserService {
      */
     List<WarehouseUserEntity> getListByCode(String code);
 
+    List<WarehouseUserEntity> selectCodeByUser(String userId);
+
     /**
      * 新增仓库字典，用户关联数据
      *

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -13,11 +13,13 @@ import com.glxp.api.admin.dao.inout.CodesDao;
 import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
 import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
+import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.req.inout.OrderFilterRequest;
 import com.glxp.api.admin.req.inout.OrderQueryRequest;
 import com.glxp.api.admin.res.inout.StockOrderResponse;
+import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.common.enums.ResultEnum;
@@ -47,6 +49,8 @@ public class OrderServiceImpl implements OrderService {
     CodesDao codesDao;
     @Resource
     CodesTempDao codesTempDao;
+    @Resource
+    SystemParamConfigService systemParamConfigService;
 
     @Override
     public List<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) {
@@ -202,7 +206,12 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setSupplementNo(order.getId());
         supplementOrder.setId(supplementOrderNo);
         //修改状态
-        supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
+        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
+        if ("1".equals(systemParamConfigEntity.getParamValue())) {
+            supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);        //设置状态为补录单据
+        } else {
+            supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
+        }
         supplementOrder.setExportStatus(0);  //设置导出状态为未导出
         supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
         supplementOrder.setReceiveStatus(0); //设置验收状态为未验收

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java

@@ -30,6 +30,11 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         return warehouseUserEntities;
     }
 
+    @Override
+    public List<WarehouseUserEntity> selectCodeByUser(String userId) {
+        return warehouseUserDao.selectCodeByUser(userId);
+    }
+
     @Override
     public void saveWarehouseUser(String code, List<AuthAdmin> userList) {
         if (CollUtil.isNotEmpty(userList)) {

api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java

@@ -231,7 +231,8 @@ public class InvProductsTrService {
                 //获取当前条码实际数量
                 int actCount = getActCount(warehouseEntity);
                 int count = 0;
-                UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
+//                UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
+
                 String code = warehouseEntity.getCode();
                 count = actCount * warehouseEntity.getCount();
                 /**
@@ -251,7 +252,7 @@ public class InvProductsTrService {
                     invWarehouseEntity = invWarehouseService.findDefault(true, true);
 
 
-                int invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode());
+                int invCount = getCountByOrder(null, warehouseEntity);
                 warehouseEntity.setFromCorpId(invWarehouseEntity.getCode());
                 warehouseEntity.setFromCorp(invWarehouseEntity.getName());
                 if (invCount > 0) {//仓库已存在该产品
@@ -296,7 +297,7 @@ public class InvProductsTrService {
                     warehouseEntity.setFromCorp(pInWarehouseEntity.getName());
                     warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode());
 
-                    invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode());
+                    invCount = getCountByOrder(null, warehouseEntity);
 //                    invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), locWarehouseEntity.getPcode());
 //                    if (invCount <= 0) {
 //                        invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), locWarehouseEntity.getPcode());
@@ -310,7 +311,7 @@ public class InvProductsTrService {
                     warehouseEntity.setFromCorpId(warehouseEntity.getSupId());
                     BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId());
                     warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName());
-                    invCount = getCountByOrder(null, udiInfoEntity.getRelId(), warehouseEntity.getBatchNo(), warehouseEntity.getSupId(), warehouseEntity.getLocStorageCode());
+                    invCount = getCountByOrder(null, warehouseEntity);
 
 //                    invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null);
 //                    if (invCount <= 0) {
@@ -1001,13 +1002,13 @@ public class InvProductsTrService {
                         int actCount = getActCount(warehouseEntity);
 
                         String code = warehouseEntity.getCode();
-                        UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
-                        if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
-                                || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
-                            warehouseEntity.setNameCode(udiInfoEntity.getNameCode());
-                            code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity);
-                            warehouseEntity.setCode(code);
-                        }
+//                        UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity);
+//                        if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
+//                                || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
+//                            warehouseEntity.setNameCode(udiInfoEntity.getNameCode());
+//                            code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity);
+//                            warehouseEntity.setCode(code);
+//                        }
                         invProductDetailEntity.setCode(code);
                         invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo());
                         invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate());
@@ -1017,7 +1018,7 @@ public class InvProductsTrService {
                         invProductDetailEntity.setInvStorageCode(warehouseEntity.getInvStorageCode());
                         invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getWarehouseCode());
                         invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId());
-                        invProductDetailEntity.setCount(actCount * warehouseEntity.getCount());
+                        invProductDetailEntity.setCount(warehouseEntity.getCount());
                         if (purchaseType != null) {
                             invProductDetailEntity.setPurchaseType(purchaseType);
                         }
@@ -1084,9 +1085,10 @@ public class InvProductsTrService {
     }
 
     public int getActCount(WarehouseEntity warehouseEntity) {
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
         UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
         if (udiInfoBean != null) {
-            if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
+            if ((udiRelevanceEntity.getIsUseDy()!=null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) {
                 if (udiInfoBean.getBhzxxsbzsl() == 0)
                     return udiInfoBean.getZxxsbzbhsydysl();
                 else
@@ -1143,6 +1145,11 @@ public class InvProductsTrService {
         return null;
     }
 
+    public UdiRelevanceResponse getUdiInfo(WarehouseEntity warehouseEntity) {
+        UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
+        return udiInfoBean;
+    }
+
 
     //根据条码获取库存结余数量
     public int getCountByOrder(String mainAction, String code, String supId, String invWarehouseCode) {
@@ -1168,12 +1175,18 @@ public class InvProductsTrService {
         return invCount;
     }
 
-    public int getCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) {
+    public int getCountByOrder(String mainAction, WarehouseEntity warehouseEntity) {
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-        filterInvProductDetailRequest.setSupId(supId);
-        filterInvProductDetailRequest.setInvStorageCode(invWarehouseCode);
-        filterInvProductDetailRequest.setProductIdFk(relId);
-        filterInvProductDetailRequest.setBatchNo(batchNo);
+        UdiRelevanceResponse udiRelevanceResponse = getUdiInfo(warehouseEntity);
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
+        if (warehouseEntity.getSerialNo() != null && udiRelevanceResponse.getDiType() == 1 && (udiRelevanceEntity.getIsUseDy()==null || !udiRelevanceEntity.getIsUseDy())) {
+            filterInvProductDetailRequest.setCode(warehouseEntity.getCode());
+        } else {
+            filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId());
+            filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
+        }
+        filterInvProductDetailRequest.setSupId(warehouseEntity.getSupId());
+        filterInvProductDetailRequest.setInvStorageCode(warehouseEntity.getLocStorageCode());
         if (mainAction != null)
             filterInvProductDetailRequest.setMainAction(mainAction);
         List<InvProductDetailEntity> resultLists = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -310,7 +310,8 @@ public class IoTransInoutService {
                 if (udiEntity.getExpireDate() != null) {
                     String expireDate = "20" + udiEntity.getExpireDate();
                     long expireTime = DateUtil.parseDateExpire(expireDate);
-                    if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) {
+                    long curTime = System.currentTimeMillis();
+                    if ((expireTime - curTime) > 0 && (expireTime - curTime) < recent * 24 * 60 * 60 * 1000) {
                         orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
                         orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！");
                         return;
@@ -511,7 +512,7 @@ public class IoTransInoutService {
             }
 
             genOrderDetail(warehouseEntityList);
-            checkMutiDi(orderEntity.getId());   //校验一个DI是否绑定多个产品ID
+            checkMutiDi(orderEntity.getId(), bussinessTypeEntity);   //校验一个DI是否绑定多个产品ID
             orderEntity = orderService.findById(orderEntity.getId());
             if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
                 orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK);
@@ -521,8 +522,9 @@ public class IoTransInoutService {
 
     //无需校验，已完成
     public void unCheckFinish(OrderEntity orderEntity, List<WarehouseEntity> warehouseEntityList) {
+        BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         genOrderDetail(warehouseEntityList);
-        checkMutiDi(orderEntity.getId());   //校验一个DI是否绑定多个产品ID
+        checkMutiDi(orderEntity.getId(), bussinessTypeEntity);   //校验一个DI是否绑定多个产品ID
         orderEntity = orderService.findById(orderEntity.getId());
         if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
             List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllByOrderIdFk(orderEntity.getId());
@@ -606,51 +608,63 @@ public class IoTransInoutService {
     }
 
 
-    public void checkMutiDi(String orderId) {
-        //校验是否di绑定多个产品ID
+    public void checkMutiDi(String orderId, BussinessTypeEntity bussinessTypeEntity) {
+
         OrderEntity orderEntity = orderService.findById(orderId);
-        BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
         filterErpOrderRequest.setOrderId(orderId);
         List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
+        int checkStatus = ConstantStatus.ORDER_STATUS_CHECK;
         if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
             for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
-                WarehouseEntity warehouseEntity = warehouseService.findOneByNameCode(erpOrderEntity.getOrderIdFk(), erpOrderEntity.getNameCode());
-                if (warehouseEntity != null && warehouseEntity.getStatus() == ConstantStatus.ORDER_DETAIL_DI_MUTI) {
+
+                //校验DI是否绑定多个产品ID
+                FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+                filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
+                List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
+                if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
+
                     erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
                     myErpOrderService.updateErpOrder(erpOrderEntity);
-                    if (warehouseEntity.getRelId() == null) {
-                        orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
-                        orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
-                        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
-                        orderService.updateOrder(orderEntity);
-                    }
+                    orderEntity.setRemark("该产品维护多个产品信息，请在扫码单据详情绑定对应产品产品信息");
+                    checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
 
                 } else {
-                    if (!bussinessTypeEntity.isInnerOrder()) {
+                    if ((erpOrderEntity.getSupId() == null || erpOrderEntity.getSupId().equals("MUTI"))) {
                         if (erpOrderEntity.getSupId() == null) {
-                            erpOrderEntity.setSupId(null);
                             erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_NONE);
-                            orderEntity.setRemark("该产品未绑定供应商");
-                            orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
-                            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
-                            orderService.updateOrder(orderEntity);
-                        } else if (Constant.MUTI.equals(erpOrderEntity.getSupId())) {
+                            orderEntity.setRemark("该产品未指定供应商");
+                        } else {
                             erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_MUTI);
-                            orderEntity.setRemark("该产品绑定多个供应商");
-                            orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
-                            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+                            orderEntity.setRemark("该产品指定多个供应商");
+                        }
+                        checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
+                    } else {
+                        CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getBindRlFk(), erpOrderEntity.getSupId());
+                        if (companyProductRelevanceEntity == null) {
+                            orderEntity.setRemark(erpOrderEntity.getCoName() + "该产品非此供应商配送");
+                            checkStatus = ConstantStatus.ORDER_CHECK_FAIL;
                         } else {
+                            orderEntity.setContrastStatus(checkStatus);
                             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+                            orderService.updateOrder(orderEntity);
                             erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE);
                         }
+
+
                     }
-                    myErpOrderService.updateErpOrder(erpOrderEntity);
                 }
+                myErpOrderService.updateErpOrder(erpOrderEntity);
+
 
             }
 
+            orderEntity.setContrastStatus(checkStatus);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+            orderService.updateOrder(orderEntity);
+
         }
+
     }
 
 

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml

@@ -242,10 +242,14 @@
     <select id="selectListByCode" resultMap="BaseResultMap">
         select inv_warehouse_user.*, auth_user.employeeName
         from inv_warehouse_user
-        inner join auth_user on auth_user.id = inv_warehouse_user.userId
+                 inner join auth_user on auth_user.id = inv_warehouse_user.userId
         where code = #{code}
     </select>
-
+    <select id="selectCodeByUser" resultMap="BaseResultMap">
+        select inv_warehouse_user.*
+        from inv_warehouse_user
+        where userId = #{userId}
+    </select>
     <delete id="deleteByCode">
         delete
         from inv_warehouse_user

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -149,6 +149,12 @@
             <if test="invWarehouseCode != '' and invWarehouseCode != null">
                 AND invWarehouseCode = #{invWarehouseCode}
             </if>
+            <if test="invCodes != null and invCodes.size > 0">
+                AND invStorageCode IN
+                <foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
 
         </where>
         <if test="groupType != '' and groupType != null">

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml

@@ -119,7 +119,8 @@
             parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
         insert INTO inv_product_detail
         (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
-        purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode)
+        purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode
+        ,invStorageCode,invWarehouseCode)
         values
 
         <foreach collection="invProductDetailEntitys" item="item" index="index"
@@ -130,7 +131,7 @@
             #{item.customerId},#{item.mainAction},#{item.action},#{item.count},#{item.updateTime},
             #{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate},
             #{item.unitFk},#{item.stockIdFk}
-            ,#{item.supId},#{item.originCode}
+            ,#{item.supId},#{item.originCode},#{item.invStorageCode},#{item.invWarehouseCode}
             )
         </foreach>