Merge branch 'master' of https://gitee.com/anthonywj/udims-java into udims_mango

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java

@@ -225,10 +225,10 @@ public class InoutUtils {
         return detailCodeEntity;
     }
 
-    public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) {
+    public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, WarehouseEntity warehouseEntity) {
         String prefix;
-        prefix = FilterUdiUtils.getDiStr(code);
+        prefix = FilterUdiUtils.getDiStr(warehouseEntity.getCode());
-        UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix);
+        UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix, warehouseEntity.getCustomerId() + "");
         if (udiInfoEntity == null) {
 //            udiInfoEntity = new UdiInfoEntity();
             List<UdiInfoEntity> froms = new UdiDlHttpClient(udiUrl).getUdiByDi(prefix);
@@ -251,14 +251,17 @@ public class InoutUtils {
                 udiInfoEntity = new UdiInfoEntity();
             }
         }
-        udiInfoEntity.setCode(code);
+        udiInfoEntity.setCode(warehouseEntity.getCode());
         udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);
         return udiInfoEntity;
     }
 
 
-    public String vailIsUseDy(WarehousetempEntity warehouseEntity) {
+    public String vailIsUseDy(WarehousetempEntity warehousetempEntity) {
-        UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, null, warehouseEntity.getCode());
+        WarehouseEntity warehouseEntity1 = new WarehouseEntity();
+        warehouseEntity1.setCode(warehousetempEntity.getCode());
+        warehouseEntity1.setCustomerId(warehousetempEntity.getCustomerId());
+        UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, null, warehouseEntity1);
         if (udiInfoEntity.getDiType() == Constant.DITYPE_SYDY) {
             if (udiInfoEntity.getIsUseDy() != Constant.USEDY_TRUE) {
                 return "该产品未勾选以使用单元入库";
@@ -274,7 +277,7 @@ public class InoutUtils {
         if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
             List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
             for (WarehouseEntity warehouseEntity : warehouseEntityList) {
-                UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
+                UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity);
                 if (udiInfoEntity != null) {
                     if (warehouseEntity.getCount() != null)
                         udiInfoEntity.setCount(warehouseEntity.getCount());

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java

@@ -56,7 +56,7 @@ public class InvProductsController {
 
         List<InvProductEntity> invProductEntities = invProductEntityPageResult.getList();
         for (InvProductEntity invProductEntity : invProductEntities) {
-            UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(invProductEntity.getRelIdFk());
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(invProductEntity.getRelIdFk(),invProductEntity.getCustomerId());
             invProductEntity.setNameCode(udiInfoEntity.getNameCode());
             invProductEntity.setProductsName(udiInfoEntity.getCpmctymc());
             invProductEntity.setGgxh(udiInfoEntity.getGgxh());

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java

@@ -123,7 +123,7 @@ public class UdiRelevanceController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         String ids = deleteRequest.getId();
-        List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(ids);
+        List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(ids, authAdmin.getCustomerId() + "");
         if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
             for (int i = 0; i < udiInfoEntities.size(); i++) {
                 List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode(), authAdmin.getCustomerId());
@@ -131,7 +131,7 @@ public class UdiRelevanceController {
                     return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
                 }
             }
-            udiInfoService.deleteByUuid(ids);
+            udiInfoService.deleteByUuid(ids, authAdmin.getCustomerId() + "");
         }
         return ResultVOUtils.success("删除成功");
     }

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java

@@ -4,14 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udi.admin.entity.auth.AuthAdmin;
-import com.glxp.udi.admin.entity.inout.OrderMdEntity;
+import com.glxp.udi.admin.entity.inout.*;
-import com.glxp.udi.admin.entity.inout.TraceUploadEntity;
-import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
-import com.glxp.udi.admin.entity.inout.WarehouseEntity;
 import com.glxp.udi.admin.entity.udid.UdiEntity;
 import com.glxp.udi.admin.exception.JsonException;
+import com.glxp.udi.admin.mongo.service.InvProductDetailMdService;
+import com.glxp.udi.admin.mongo.service.InvProductMdService;
 import com.glxp.udi.admin.mongo.service.OrderMdService;
 import com.glxp.udi.admin.mongo.service.WarehouseMdService;
+import com.glxp.udi.admin.req.inout.FilterInvProductDetailRequest;
 import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
 import com.glxp.udi.admin.req.inout.OrderFilterRequest;
 import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
@@ -60,6 +60,11 @@ public class UdiTraceController {
     AuthAdminService authAdminService;
     @Resource
     private OrderMdService orderMdService;
+    @Resource
+    private InvProductMdService invProductMdService;
+    @Resource
+    private InvProductDetailMdService invProductDetailMdService;
+
 
     @GetMapping("/udiwarehouse/trace/filter")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -72,7 +77,7 @@ public class UdiTraceController {
             warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
 //        List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
 
-
+        String customerId = authAdmin.getCustomerId() + "";
         List<WarehouseEntity> warehouseEntityList = warehouseMdService.filterWarehouse(warehouseQueryRequest);
         if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
             WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
@@ -80,7 +85,7 @@ public class UdiTraceController {
             String udi = udiEntity.getUdi();
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setNameCode(udi);
-            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi, customerId);
 //            List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
 //            {
 //                UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
@@ -94,7 +99,7 @@ public class UdiTraceController {
 //            }).collect(Collectors.toList());
 
             //查找父级或者子级
-            List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
+            List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid(), customerId);
             List<UdiTraceResponse> udiTraceResponseList = new ArrayList<>();
             if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
 
@@ -156,16 +161,18 @@ public class UdiTraceController {
         AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
         if (authAdmin.getCustomerId() != 110)
             warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
+        String customerId = authAdmin.getCustomerId() + "";
         if (warehouseQueryRequest.getCode() != null && !"".equals(warehouseQueryRequest.getCode())) {
             if (warehouseQueryRequest.getFilterType() == null || warehouseQueryRequest.getFilterType() == 1) {
                 List<OrderMdEntity> temps = filterUdiTrace(warehouseQueryRequest);
+                if (temps != null)
                     orderMdEntities.addAll(temps);
             } else {
                 UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseQueryRequest.getCode());
                 if (udiEntity == null)
                     return ResultVOUtils.error(500, "UDI码格式错误！");
-                UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi());
+                UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi(), customerId);
-                List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
+                List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid(), customerId);
                 if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
                     for (UdiInfoEntity temp : udiInfoEntities) {
                         WarehouseQueryRequest queryRequest = new WarehouseQueryRequest();
@@ -191,14 +198,47 @@ public class UdiTraceController {
     }
 
     public List<OrderMdEntity> filterUdiTrace(WarehouseQueryRequest warehouseQueryRequest) {
+        String code = warehouseQueryRequest.getCode();
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+        List<InvProductDetailEntity> invProductDetailEntities;
+        if (udiEntity.getSerialNo() != null) { //有序列号
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi(), warehouseQueryRequest.getCustomerId() + "");
+            List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid(), warehouseQueryRequest.getCustomerId() + "");
+            if (udiInfoEntities != null) {
+                if (udiInfoEntities.size() > 1) {//多级包装，查所有
+                    FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+                    filterInvProductDetailRequest.setProductIdFk(udiInfoEntity.getUuid());
+                    filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
+                    if (warehouseQueryRequest.getCustomerId() != null)
+                        filterInvProductDetailRequest.setCustomerId(warehouseQueryRequest.getCustomerId() + "");
+                    invProductDetailEntities = invProductDetailMdService.filterAllInvProduct(filterInvProductDetailRequest);
+                } else if (udiInfoEntities.size() == 1) {   //单级包装,且唯一查询条码
+                    FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+                    filterInvProductDetailRequest.setCode(warehouseQueryRequest.getCode());
+                    if (warehouseQueryRequest.getCustomerId() != null)
+                        filterInvProductDetailRequest.setCustomerId(warehouseQueryRequest.getCustomerId() + "");
+                    invProductDetailEntities = invProductDetailMdService.filterAllInvProduct(filterInvProductDetailRequest);
+                } else
+                    return null;
+            } else
+                return null;
+        } else {
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi(), warehouseQueryRequest.getCustomerId() + "");
+            FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+            filterInvProductDetailRequest.setProductIdFk(udiInfoEntity.getUuid());
+            filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
+            if (warehouseQueryRequest.getCustomerId() != null)
+                filterInvProductDetailRequest.setCustomerId(warehouseQueryRequest.getCustomerId() + "");
+            invProductDetailEntities = invProductDetailMdService.filterAllInvProduct(filterInvProductDetailRequest);
+        }
+        if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) {
             List<OrderMdEntity> orderMdEntities = new ArrayList<>();
-        List<WarehouseEntity> warehouseEntityList = warehouseMdService.filterWarehouse(warehouseQueryRequest);
             List<String> orderS = new ArrayList<>();
-        warehouseEntityList.stream().filter(
+            invProductDetailEntities.stream().filter(
                     v -> {
-                    boolean flag = !orderS.contains(v.getOrderId());
+                        boolean flag = !orderS.contains(v.getOrderIdFk());
                         if (flag)
-                        orderS.add(v.getOrderId());
+                            orderS.add(v.getOrderIdFk());
                         return flag;
                     }
             ).collect(Collectors.toList());
@@ -212,6 +252,8 @@ public class UdiTraceController {
             }
             Collections.sort(orderMdEntities, Comparator.comparing(OrderMdEntity::getId));
             return orderMdEntities;
+        } else return null;
+
     }
 
     @GetMapping("/coor/trace/findCode")

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java

@@ -14,11 +14,11 @@ public interface UdiInfoDao {
 
     List<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest);
 
-    UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode);
+    UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode, @Param("customerId") String customerId);
 
-    UdiInfoEntity findByUuid(@Param("uuid") String uuid);
+    UdiInfoEntity findByUuid(@Param("uuid") String uuid, @Param("customerId") String customerId);
 
-    List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid);
+    List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid, @Param("customerId") String customerId);
 
 
     UdiInfoEntity selectById(@Param("id") String id);
@@ -28,10 +28,11 @@ public interface UdiInfoDao {
     boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
 
     boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
+
     boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
 
     boolean deleteById(@Param("id") String id);
 
-    boolean deleteByUuid(@Param("uuid") String uuid);
+    boolean deleteByUuid(@Param("uuid") String uuid, @Param("customerId") String customerId);
 
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java

@@ -15,5 +15,9 @@ public class InvProductDetailEntity {
     private String action;
     private Integer count;
     private Date updateTime;
+    private String batchNo;
+    private String productionDate;
+    private String expireDate;
+    private String invProductIdFk;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductDetailMdService.java

@@ -39,12 +39,35 @@ public class InvProductDetailMdService {
         if (filterInvProductDetailRequest.getCustomerId() != null && !filterInvProductDetailRequest.getCustomerId().isEmpty()) {
             query.addCriteria(Criteria.where("customerId").is(filterInvProductDetailRequest.getCustomerId()));
         }
+        if (filterInvProductDetailRequest.getBatchNo() != null && !filterInvProductDetailRequest.getBatchNo().isEmpty()) {
+            query.addCriteria(Criteria.where("batchNo").is(filterInvProductDetailRequest.getBatchNo()));
+        }
         return mongoPageHelper.pageQuery(query, InvProductDetailEntity.class,
                 filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getPage(),
                 filterInvProductDetailRequest.getLastId(), MongoDBName.NAME_INV_PRODUCT_DETAIL);
 
     }
 
+    public List<InvProductDetailEntity> filterAllInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
+        Query query = new Query();
+        if (filterInvProductDetailRequest.getCode() != null && !filterInvProductDetailRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(filterInvProductDetailRequest.getCode()));
+        }
+        if (filterInvProductDetailRequest.getProductIdFk() != null && !filterInvProductDetailRequest.getProductIdFk().isEmpty()) {
+            query.addCriteria(Criteria.where("productIdFk").is(filterInvProductDetailRequest.getProductIdFk()));
+        }
+        if (filterInvProductDetailRequest.getMainAction() != null && !filterInvProductDetailRequest.getMainAction().isEmpty()) {
+            query.addCriteria(Criteria.where("mainAction").is(filterInvProductDetailRequest.getMainAction()));
+        }
+        if (filterInvProductDetailRequest.getCustomerId() != null && !filterInvProductDetailRequest.getCustomerId().isEmpty()) {
+            query.addCriteria(Criteria.where("customerId").is(filterInvProductDetailRequest.getCustomerId()));
+        }
+        if (filterInvProductDetailRequest.getBatchNo() != null && !filterInvProductDetailRequest.getBatchNo().isEmpty()) {
+            query.addCriteria(Criteria.where("batchNo").is(filterInvProductDetailRequest.getBatchNo()));
+        }
+        return mongoTemplate.find(query, InvProductDetailEntity.class, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+    }
+
     public void insertInvProduct(InvProductDetailEntity invProductDetailEntity) {
         mongoTemplate.insert(invProductDetailEntity, MongoDBName.NAME_INV_PRODUCT_DETAIL);
     }
@@ -60,7 +83,7 @@ public class InvProductDetailMdService {
 
     public void updateInvProduct(InvProductDetailEntity invProductDetailEntity) {
         Query query = new Query();
-        query.addCriteria(new Criteria().and("id").is(invProductDetailEntity.getId()));
+        query.addCriteria(new Criteria().and("_id").is(invProductDetailEntity.getId()));
         Update update = new Update();
 
         if (invProductDetailEntity.getCount() != null) {
@@ -98,7 +121,7 @@ public class InvProductDetailMdService {
     public void deleteByProductId(String productIdFk) {
         Query query = new Query();
         if (productIdFk != null) {
-            query.addCriteria(Criteria.where("productIdFk").is(productIdFk));
+            query.addCriteria(Criteria.where("invProductIdFk").is(productIdFk));
         }
         mongoTemplate.remove(query, InvProductDetailEntity.class, MongoDBName.NAME_INV_PRODUCT_DETAIL);
     }

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java

@@ -38,7 +38,7 @@ public class InvProductMdService {
     }
 
 
-    public InvProductEntity selectByUuid(String relIdFk, String batchNo) {
+    public InvProductEntity selectByUuid(String relIdFk, String batchNo, String customerId) {
         Query query = new Query();
         if (relIdFk != null && !relIdFk.isEmpty()) {
             query.addCriteria(Criteria.where("relIdFk").is(relIdFk));
@@ -46,6 +46,9 @@ public class InvProductMdService {
         if (batchNo != null && !batchNo.isEmpty()) {
             query.addCriteria(Criteria.where("batchNo").is(batchNo));
         }
+        if (customerId != null && !customerId.isEmpty()) {
+            query.addCriteria(Criteria.where("customerId").is(customerId));
+        }
         List<InvProductEntity> invProductEntities = mongoTemplate.find(query, InvProductEntity.class, MongoDBName.NAME_INV_PRODUCT);
         if (invProductEntities != null && invProductEntities.size() > 0) {
             return invProductEntities.get(0);
@@ -72,7 +75,7 @@ public class InvProductMdService {
 
     public void updateInvProduct(InvProductEntity invProductEntity) {
         Query query = new Query();
-        query.addCriteria(new Criteria().and("id").is(invProductEntity.getId()));
+        query.addCriteria(new Criteria().and("_id").is(invProductEntity.getId()));
         Update update = new Update();
 
         if (invProductEntity.getInCount() != null) {

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java

@@ -57,7 +57,7 @@ public class OrderDetailMdService {
 
     public void updateOrderDetail(ErpOrderEntity erpOrderEntity) {
         Query query = new Query();
-        query.addCriteria(new Criteria().and("id").is(erpOrderEntity.getId()));
+        query.addCriteria(new Criteria().and("_id").is(erpOrderEntity.getId()));
         Update update = new Update();
 
         if (erpOrderEntity.getCount() != null) {

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java

@@ -133,7 +133,7 @@ public class OrderMdService {
         if (orderMdEntity.getOrderId() != null && !orderMdEntity.getOrderId().isEmpty()) {
             query.addCriteria(new Criteria().and("orderId").is(orderMdEntity.getOrderId()));
         } else if (orderMdEntity.getId() != null && !orderMdEntity.getId().isEmpty()) {
-            query.addCriteria(new Criteria().and("id").is(orderMdEntity.getId()));
+            query.addCriteria(new Criteria().and("_id").is(orderMdEntity.getId()));
         } else {
             log.error("更新失败，未指定orderId");
             return;

api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterInvProductDetailRequest.java

@@ -11,6 +11,7 @@ public class FilterInvProductDetailRequest extends ListPageRequest {
     private String productIdFk;
     private String customerId;
     private String mainAction;
+    private String batchNo;
     private String action;
     private Integer count;
     private String lastId;

api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java

@@ -14,13 +14,13 @@ public interface UdiInfoService {
 
     List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
 
-    UdiInfoEntity findByNameCode(String nameCode);
+    UdiInfoEntity findByNameCode(String nameCode, String customerId);
 
-    UdiInfoEntity selectById(String nameCode);
+    UdiInfoEntity selectById(String nameCode, String customerId);
 
-    UdiInfoEntity findByUuid(String uuid);
+    UdiInfoEntity findByUuid(String uuid, String customerId);
 
-    List<UdiInfoEntity> findByUuids(String uuid);
+    List<UdiInfoEntity> findByUuids(String uuid, String customerId);
 
     boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
 
@@ -30,7 +30,7 @@ public interface UdiInfoService {
 
     boolean deleteById(String id);
 
-    boolean deleteByUuid(String uuid);
+    boolean deleteByUuid(String uuid, String customerId);
 
     boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
 

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java

@@ -52,24 +52,24 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public UdiInfoEntity findByNameCode(String nameCode) {
+    public UdiInfoEntity findByNameCode(String nameCode, String customerId) {
         String prefix = FilterUdiUtils.getDiStr(nameCode);
-        return udiInfoDao.findByNameCode(prefix);
+        return udiInfoDao.findByNameCode(prefix,customerId);
     }
 
     @Override
-    public UdiInfoEntity selectById(String nameCode) {
+    public UdiInfoEntity selectById(String nameCode, String customerId) {
         return udiInfoDao.selectById(nameCode);
     }
 
     @Override
-    public UdiInfoEntity findByUuid(String uuid) {
+    public UdiInfoEntity findByUuid(String uuid, String customerId) {
-        return udiInfoDao.findByUuid(uuid);
+        return udiInfoDao.findByUuid(uuid,customerId);
     }
 
     @Override
-    public List<UdiInfoEntity> findByUuids(String uuid) {
+    public List<UdiInfoEntity> findByUuids(String uuid, String customerId) {
-        return udiInfoDao.findByUuids(uuid);
+        return udiInfoDao.findByUuids(uuid,customerId);
     }
 
     @Override
@@ -93,8 +93,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean deleteByUuid(String uuid) {
+    public boolean deleteByUuid(String uuid, String customerId) {
-        return udiInfoDao.deleteByUuid(uuid);
+        return udiInfoDao.deleteByUuid(uuid,customerId);
     }
 
     @Override

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

@@ -38,6 +38,7 @@ public class InvProductsTrService {
         orderFilterRequest.setId(orderId);
         List<OrderMdEntity> orderMdEntities = orderService.findAll(orderFilterRequest);
         OrderMdEntity orderEntity = orderMdEntities.get(0);
+        String customerId = orderEntity.getCustomerId() + "";
         if (orderEntity.getStatus().equals("success")) {
             FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
             filterErpOrderRequest.setOrderId(orderId);
@@ -46,8 +47,8 @@ public class InvProductsTrService {
                 for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
 
                     String nameCode = erpOrderEntity.getNameCode();
-                    UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode);
+                    UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode, customerId);
-                    InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno());
+                    InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno(), orderEntity.getCustomerId() + "");
                     if (invProductEntity == null) {
                         invProductEntity = new InvProductEntity();
                         invProductEntity.setRelIdFk(udiInfoEntity.getUuid());
@@ -62,11 +63,13 @@ public class InvProductsTrService {
                         invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode());
                         if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
                             invProductEntity.setOutCount(erpOrderEntity.getCount());
+                            invProductEntity.setInCount(0);
                         } else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) {
                             invProductEntity.setInCount(erpOrderEntity.getCount());
+                            invProductEntity.setOutCount(0);
                         }
                         invProductService.insertInvProduct(invProductEntity);
-                        invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo());
+                        invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo(), orderEntity.getCustomerId() + "");
                     } else {
                         if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
                             invProductEntity.setOutCount(invProductEntity.getOutCount() + erpOrderEntity.getCount());
@@ -81,17 +84,21 @@ public class InvProductsTrService {
                     if (warehouseEntities != null && warehouseEntities.size() > 0) {
 
                         for (WarehouseEntity warehouseEntity : warehouseEntities) {
-                            UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi());
+                            UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi(), customerId);
                             if (tempUdi.getUuid().equals(erpOrderEntity.getUuidFk())) {
                                 if ((warehouseEntity.getBatchNo() == null && erpOrderEntity.getLotno() == null) ||
                                         warehouseEntity.getBatchNo().equals(erpOrderEntity.getLotno())) {
                                     InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
-                                    invProductDetailEntity.setProductIdFk(invProductEntity.getId() + "");
+                                    invProductDetailEntity.setProductIdFk(invProductEntity.getRelIdFk() + "");
+                                    invProductDetailEntity.setInvProductIdFk(invProductEntity.getId());
                                     invProductDetailEntity.setCode(warehouseEntity.getCode());
                                     invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId());
                                     invProductDetailEntity.setCount(warehouseEntity.getCount());
                                     invProductDetailEntity.setAction(warehouseEntity.getAction());
+                                    invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo());
                                     invProductDetailEntity.setMainAction(warehouseEntity.getMainAction());
+                                    invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate());
+                                    invProductDetailEntity.setExpireDate(warehouseEntity.getExpireDate());
                                     invProductDetailEntity.setUpdateTime(new Date());
                                     invProductDetailEntity.setCustomerId(orderEntity.getCustomerId() + "");
                                     invProductDetailService.insertInvProduct(invProductDetailEntity);

api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java

@@ -180,7 +180,7 @@ public class TransInoutService {
         UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
         if (udiEntity != null) {
             String udi = udiEntity.getUdi();
-            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi, warehouseEntity.getCustomerId() + "");
             if (udiInfoEntity != null && (udiInfoEntity.getDiType() == 4
                     || (udiInfoEntity.getDiType() == 1 && udiInfoEntity.getIsUseDy() == 1))) {
                 CodeNeedRlEntity codeNeedRlEntity = new CodeNeedRlEntity();

api-udims/src/main/java/com/glxp/udi/admin/util/FilterUdiUtils.java

@@ -2,6 +2,7 @@ package com.glxp.udi.admin.util;
 
 
 import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
+import com.glxp.udi.admin.entity.inout.WarehouseEntity;
 import com.glxp.udi.admin.entity.udid.UdiEntity;
 
 /**
@@ -248,8 +249,10 @@ public class FilterUdiUtils {
             data.setProduceDate(udiEntity.getProduceDate());
             data.setExpireDate(udiEntity.getExpireDate());
             data.setSerialNo(udiEntity.getSerialNo());
+            data.setUdi(udiEntity.getUdi());
         }
         return data;
     }
 
+
 }

api-udims/src/main/resources/application-pro.properties

@@ -22,7 +22,7 @@ cors.allowed-Credentials=true
 UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
 #UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_Server
 UCLOD_SERVER_URL=http://127.0.0.1:9997
-UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
 COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload
 #同步库接口调用地址相关信息  https://www.udims.com/UDI_DL_Server_test
 UDI_SERVER.url= http://localhost:9994

api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml

@@ -53,31 +53,40 @@
     </select>
     <select id="findByUuid" parameterType="java.lang.String"
             resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
-        SELECT *   FROM  io_productinfo WHERE (
+        SELECT *
+        FROM io_productinfo
+        WHERE (
                   uuid = #{uuid} and diType = 1) limit 1
     </select>
 
     <select id="findByUuids" parameterType="java.lang.String"
             resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
-        SELECT *   FROM  io_productinfo WHERE (
+        SELECT *
+        FROM io_productinfo
+        WHERE (
                   uuid = #{uuid})
     </select>
 
 
     <select id="selectById" parameterType="java.lang.String"
             resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
-        SELECT *   FROM  io_productinfo WHERE (
+        SELECT *
+        FROM io_productinfo
+        WHERE (
                   id = #{id}) limit 1
     </select>
 
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
-        SELECT *   FROM  io_productinfo WHERE (
+        SELECT *
+        FROM io_productinfo
+        WHERE (
                   nameCode = #{nameCode}) limit 1
     </select>
 
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
-        replace INTO io_productinfo
+        replace
+        INTO io_productinfo
         (
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,isUseDy,
@@ -157,11 +166,15 @@
     </insert>
 
     <delete id="deleteById" parameterType="Map">
-        DELETE FROM io_productinfo  WHERE id =  #{id}
+        DELETE
+        FROM io_productinfo
+        WHERE id = #{id}
     </delete>
 
     <delete id="deleteByUuid" parameterType="Map">
-        DELETE FROM io_productinfo  WHERE uuid =  #{uuid}
+        DELETE
+        FROM io_productinfo
+        WHERE uuid = #{uuid}
     </delete>
 
     <update id="updateUdiInfo" parameterType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
@@ -189,6 +202,7 @@
             <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
             <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
             <if test="diType != null">diType=#{diType},</if>
+            <if test="customerId != null">customerId=#{customerId},</if>
         </set>
         WHERE nameCode = #{nameCode}
     </update>
@@ -198,6 +212,7 @@
         <set>
             <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
             <if test="isUseDy != null">isUseDy=#{isUseDy},</if>
+            <if test="customerId != null">customerId=#{customerId},</if>
         </set>
         WHERE uuid = #{uuid}
     </update>

api-udims/src/test/java/com/glxp/udi/admin/util/MongoDbTest.java

@@ -1,8 +1,11 @@
 package com.glxp.udi.admin.util;
 
 import com.glxp.udi.BaseApiAdminApplicationTest;
+import com.glxp.udi.admin.constant.TypeConstant;
+import com.glxp.udi.admin.entity.inout.InvProductEntity;
 import com.glxp.udi.admin.entity.inout.WarehouseEntity;
 import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
+import com.glxp.udi.admin.mongo.service.InvProductMdService;
 import com.glxp.udi.admin.mongo.service.WarehouseMdService;
 import com.glxp.udi.admin.mongo.service.WarehouseTempMdService;
 import com.glxp.udi.admin.mongo.utils.PageResult;
@@ -23,7 +26,8 @@ public class MongoDbTest extends BaseApiAdminApplicationTest {
     private WarehouseTempMdService warehousetempService;
     @Resource
     private WarehouseMdService warehouseMdService;
-
+    @Resource
+    private InvProductMdService invProductService;
 
     private static final Logger log = LoggerFactory.getLogger(MongoDbTest.class);
 
@@ -89,4 +93,15 @@ public class MongoDbTest extends BaseApiAdminApplicationTest {
     public void updateWarehouse() {
         warehouseMdService.updateUnit("110", "123456", "厦门片仔癀");
     }
+
+
+    @Test
+    public void testUpDATE() {
+
+        InvProductEntity invProductEntity = new InvProductEntity();
+        invProductEntity.setInCount(44);
+        invProductEntity.setProductsName("-----11111");
+        invProductEntity.setId("620e0708f9c53f8a80d3166b");
+        invProductService.updateInvProduct(invProductEntity);
+    }
 }