修改仓库取消绑定用户以及耗材字典查询问题

api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java

@@ -59,6 +59,7 @@ public class UdiInfoEntity {
     private String supId;
     private boolean isAdavence;
     private boolean isDisable;
+    private boolean useMuti;
 
     private Boolean isCheck;
     private boolean allowNoBatch;

api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java

@@ -77,11 +77,11 @@ public class SyncUdiService {
             if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
                 return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
             }
+            if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
+                return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
+            }
         }
 
-        if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
-            return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
-        }
         productInfoFilterRequest.setIsNewest(1);
 //        productInfoFilterRequest.setDiType("1");
 

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

@@ -68,7 +68,5 @@ public interface WarehouseUserService {
      */
     Integer countUserBySubInvCode(String subInvCode);
 
-    /** 查询出取消的用户 ...*/
-    List<WarehouseUserEntity> getNotWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
 
 }

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

@@ -27,6 +27,7 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvProductEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.api.admin.req.business.StockOrderFilterRequest;
 import com.glxp.api.admin.req.inout.OrderFilterRequest;
 import com.glxp.api.admin.req.inout.OrderQueryRequest;
@@ -314,11 +315,14 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
         supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
         //修改往来单位及当前库存号
-        supplementOrder.setFromCorpId(order.getLocStorageCode());
+        supplementOrder.setFromCorpId(order.getInvWarehouseCode());
+        supplementOrder.setSubInvCode(order.getInvStorageCode());
         supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
-        supplementOrder.setLocStorageCode(order.getFromCorpId());
-        supplementOrder.setInvWarehouseCode(null);
-        String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
+        //根据分库code查询总库coder
+        InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId());
+        supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId());
+        supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId());
+        String name = invWarehouseDao.getNameByCode(order.getInvStorageCode());
         if (StrUtil.isNotEmpty(order.getFromSubInvCode())) {
             supplementOrder.setInvWarehouseCode(order.getFromSubInvCode());
         } else {

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

@@ -335,6 +335,9 @@
             <if test="exportStatus != '' and exportStatus!=null">
                 and exportStatus = #{exportStatus}
             </if>
+            <if test="erpFk != '' and erpFk!=null">
+                and erpFk = #{erpFk}
+            </if>
             <if test="signStatus != '' and signStatus!=null">
                 and signStatus = #{signStatus}
             </if>