8/29 损耗日志

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -160,16 +160,29 @@ public class UdiContrastController {
         udiRelevanceEntity.setSupName(udiCombineRequest.getSupName());
         udiRelevanceEntity.setUpdateUser(customerService.getUserId() + "");
         UdiRelevanceResponse temp = udiContrastService.findById(udiRelevanceEntity.getId());
-        if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
-            return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
-        } else {
-            try {
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
-            } catch (Exception e) {
+        if (temp.getType() == 2){
+            if (udiContrastService.isDrugExit(temp.getOriginUuid(),udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
+            } else {
+                try {
+                    udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                } catch (Exception e) {
+                    return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
+                }
+            }
+        }else {
+            if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), udiCombineRequest.getThirdSys())) {
+                return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
+            } else {
+                try {
+                    udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                } catch (Exception e) {
+                    return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
+                }
             }
         }
 
+
         //关联第三方产品信息若无值则由第三方产品信息带过来
         UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
         if (StrUtil.isEmpty(udiProductEntity.getManufactory())) {

src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java

@@ -24,7 +24,7 @@ public class IoSplitDesOrder implements Serializable {
     private Integer id;
 
     @TableField(value = "billNo")
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value="")
     private String billNo;
 
     @TableField(value = "busType")
@@ -64,4 +64,4 @@ public class IoSplitDesOrder implements Serializable {
     private String updateUser;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java

@@ -30,7 +30,15 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
 
     private String updateUser;
 
-
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
 
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -257,6 +257,7 @@ public class UdiRelevanceResponse {
      * 工位预警数量
      */
     private Integer workPlaceCount;
+    private Integer type;
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java

@@ -82,6 +82,11 @@ public class IoSplitDesOrderDetailResponse {
      * 赋码错误信息
      */
     private String tagMsg;
+    private String coName;
+    private String measname;
+    private String zczbhhzbapzbh;
+    private String manufactory;
+    private String supName;
 
 
 }

src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java

@@ -9,7 +9,7 @@ public class IoSplitDesOrderResponse {
 
     private Integer id;
 
-    private Integer billNo;
+    private String billNo;
 
     private String busType;
 
@@ -28,6 +28,10 @@ public class IoSplitDesOrderResponse {
     private Date updateTime;
 
     private String updateUser;
+    private String workplaceName;
+    private String busTypeName;
+
+    private Integer status;
 
 
 }

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * 耗材字典对照
@@ -92,6 +93,52 @@ public class UdiContrastService {
         return false;
     }
 
+    public boolean isDrugExit(String originUuid,String mainId, String thirdSys) {
+
+        String deviceRecordKey = null;
+        //国家库的key
+        if (StrUtil.isNotEmpty(originUuid)) {
+            UdiProductEntity udiProductEntity = udiProductService.findOneByOriginUuid(originUuid);
+            if (udiProductEntity != null)
+                deviceRecordKey = udiProductEntity.getDeviceRecordKey();
+        }
+
+        if (StrUtil.isNotEmpty(deviceRecordKey) && StrUtil.isNotEmpty(mainId) && StrUtil.isBlank(thirdSys)) {
+            List<UdiRelevanceResponse> udiRelevanceEntities = findDrkByUnion(deviceRecordKey, mainId);
+            if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
+                return true;
+            } else
+                return false;
+        } else if (StrUtil.isNotEmpty(deviceRecordKey) && StrUtil.isEmpty(mainId)) {
+            List<UdiRelevanceResponse> udiRelevanceEntities = findByDeviceRecordKey(deviceRecordKey);
+            if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
+                for (UdiRelevanceResponse udiRelevanceEntity : udiRelevanceEntities) {
+                    if (StrUtil.isEmpty(udiRelevanceEntity.getMainId()) && StrUtil.isNotEmpty(udiRelevanceEntity.getOriginUuid())) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } else if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) {
+            List<UdiRelevanceResponse> udiRelevanceEntities = findByMainId(mainId);
+            if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
+                for (UdiRelevanceResponse udiRelevanceEntity : udiRelevanceEntities) {
+                    if (StrUtil.isEmpty(udiRelevanceEntity.getOriginUuid()) && StrUtil.isNotEmpty(udiRelevanceEntity.getMainId())) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } else if (StrUtil.isNotBlank(deviceRecordKey) && StrUtil.isNotBlank(mainId) && StrUtil.isNotBlank(thirdSys)) {
+            List<UdiRelevanceResponse> udiRelevanceEntities = findByUnion2(deviceRecordKey, mainId, thirdSys);
+            if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
+                return true;
+            } else
+                return false;
+        }
+        return false;
+    }
+
     private List<UdiRelevanceResponse> findByUnion2(String deviceRecordKey, String mainId, String thirdSys) {
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         filterUdiRelRequest.setMainId(mainId);

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1138,6 +1138,7 @@
         basic_products.sfwwjbz,
         basic_products.syqsfxyjxmj,
         basic_products.mjfs,
+        basic_products.productsType as type,
         basic_products.categoryName
 
         from basic_udirel

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml

@@ -3,10 +3,12 @@
 <mapper namespace="com.glxp.api.dao.collect.IoSplitDesOrderDetailMapper">
     <select id="filterList" parameterType="com.glxp.api.req.collect.IoSplitDesOrderDetailRequest"
             resultType="com.glxp.api.res.collect.IoSplitDesOrderDetailResponse">
-        SELECT isdod.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, bp.bzgg
+        SELECT isdod.*,bp.cpmctymc coName,bp.nameCode,COALESCE(bp.ggxh, bp.bzgg) AS ggxh,COALESCE(bp.ylqxzcrbarmc, bp.manufactory) AS manufactory,
+               bp.measname,bp.zczbhhzbapzbh,bc.name as supName
         FROM io_split_des_order_detail isdod
                  left join basic_udirel bu on isdod.relId = bu.id
                  left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_corp bc on isdod.supId = bc.erpId
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND isdod.orderIdFk = #{orderIdFk}
@@ -29,4 +31,4 @@
         </where>
         group by isdod.id
     </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml

@@ -4,9 +4,11 @@
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
             resultType="com.glxp.api.res.collect.IoSplitDesOrderResponse">
         SELECT isdo.*,
-               sw.workplaceName
+        sw.workplaceName, COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName
         FROM io_split_des_order isdo
-                 left join sys_workplace sw on isdo.workPlaceCode = sw.workplaceId
+        left join sys_workplace sw on isdo.workPlaceCode = sw.workplaceId
+        left join thr_bustype_origin on isdo.busType = thr_bustype_origin.action
+        left join basic_bussiness_type on isdo.busType = basic_bussiness_type.action
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')
@@ -17,6 +19,10 @@
             <if test="workPlaceCode != null">
                 AND isdo.workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(isdo.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                date_format(#{endTime}, '%Y-%m-%d')
+            </if>
         </where>
     </select>
-</mapper>
+</mapper>