10/15 同步优化1.0

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

@@ -345,6 +345,7 @@ public class UdiRelevanceController extends BaseController {
 //        udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi());
 //        udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit());
         udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel());
+        udiRelevanceEntity.setUnpackUseTime(udiRelevanceSaveRequest.getUnpackUseTime());
 //        udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi());
 //        udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit());
 //        udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount());

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

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.basic;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -279,13 +280,27 @@ public class UdiRlSupController extends BaseController {
         udiRelevanceEntity.setId(Long.parseLong(rlidStr));
         udiRelevanceEntity.setLockStatus(1);
         udiRelevanceEntity.setGroupBuy(udiInfoExportRequest.getSupplementRequest().getGroupBuy());
+        udiRelevanceEntity.setUpdateTime(new Date());
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);
         //处理是否需要扫码字段
         classifyCodeService.updateRequireScanCode(udiProductEntity);
-        udiProductEntity.setId(IdUtil.getSnowflakeNextId());
+        udiProductEntity.setUpdateTime(new Date());
-        udiProductService.insertUdiInfo(udiProductEntity);
+        UdiRelevanceEntity udiRelevanceEntity1 = udiRelevanceService.selectById(Long.valueOf(rlidStr));
+        UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity1.getUuid());
+        if (byUuid != null){
+            byUuid.setCatalogname1(udiProductEntity.getCatalogname1());
+            byUuid.setCatalogname2(udiProductEntity.getCatalogname2());
+            byUuid.setCatalogname3(udiProductEntity.getCatalogname3());
+            byUuid.setYbbm(udiProductEntity.getYbbm());
+            byUuid.setManufactory(udiProductEntity.getManufactory());
+            byUuid.setUpdateTime(new Date());
+            udiProductService.updateUdiInfo(byUuid);
+        }else {
+            udiProductEntity.setId(IdUtil.getSnowflakeNextId());
+            udiProductService.insertUdiInfo(udiProductEntity);
+        }
         return ResultVOUtils.success("选入成功！");
     }
 

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -332,7 +333,7 @@ public class BasicProductsEntity {
      * 最後更新時間
      */
     @TableField(value = "updateTime")
-    private String updateTime;
+    private Date updateTime;
 
     /**
      * 创建人
@@ -505,6 +506,48 @@ public class BasicProductsEntity {
     @TableField(value = "majorStatus")
     private String majorStatus;
 
+    @TableField(value = "zdcfsycs")
+    private Integer zdcfsycs;
+
+    @TableField(value = "sfwblztlcp")
+    private String sfwblztlcp;
+    @TableField(value = "cgzmraqxgxx")
+    private String cgzmraqxgxx;
+    @TableField(value = "sfbjwycxsy")
+    private String sfbjwycxsy;
+    @TableField(value = "sfwwjbz")
+    private String sfwwjbz;
+    @TableField(value = "syqsfxyjxmj")
+    private String syqsfxyjxmj;
+    @TableField(value = "mjfs")
+    private String mjfs;
+    @TableField(value = "categoryName")
+    private String categoryName;
+    @TableField(value = "destinyType")
+    private Integer destinyType;
+
+    /**
+     * 当前层级包含流通层级使用数量
+     */
+    @TableField(value = "bhltcjsl")
+    private Integer bhltcjsl;
+
+    /**
+     * 当前层级包含使用层级数量
+     */
+    @TableField(value = "bhsycjsl")
+    private Integer bhsycjsl;
+
+
+    //工位预警数量
+    @TableField(value = "workPlaceCount")
+    private Integer workPlaceCount;
+
+    /**
+     * 下级单位
+     */
+    @TableField(value = "xjdw")
+    private String xjdw;
 
 
 

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -181,4 +181,9 @@ public class UdiRelevanceSaveRequest {
      * 使用允许采集的最大层级
      */
     private Integer useMaxLevel;
+
+    /**
+     * 拆包后可用时长(小时)
+     */
+    private Integer unpackUseTime;
 }

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

@@ -274,6 +274,7 @@ public class UdiContrastService {
                 if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
                     udiProductEntity.setPrice("0.00");
                 }
+                udiProductEntity.setUpdateTime(new Date());
                 udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
                 udiProductService.insertUdiInfo(udiProductEntity);
 //                setLevel(udiRelevanceEntity.getUuid());
@@ -309,6 +310,7 @@ public class UdiContrastService {
                 udiProductEntity.setScbssfbhxlh("否");
                 udiProductEntity.setProductsType(thrProductsEntity.getProductType());
                 udiProductEntity.setRequireScanCode(0);
+                udiProductEntity.setUpdateTime(new Date());
                 if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
                     udiProductEntity.setPrice(null);
                 }
@@ -480,6 +482,7 @@ public class UdiContrastService {
         if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
             udiProductEntity.setPrice(null);
         }
+        udiProductEntity.setUpdateTime(new Date());
         udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
         udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -417,11 +417,13 @@ public class UdiProductServiceImpl implements UdiProductService {
 
             if (udiProductEntity1 != null) {
                 updateUdiProductEntity(udiProductEntity1, updateLevelDrugRequest);
+                udiProductEntity1.setUpdateTime(new Date());
                 udiProductDao.updateById(udiProductEntity1);
             } else {
                 udiProductEntity1 = new UdiProductEntity();
                 udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
                 udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
+                udiProductEntity1.setUpdateTime(new Date());
                 updateUdiProductEntity(udiProductEntity1, updateLevelDrugRequest);
                 udiProductDao.insert(udiProductEntity1);
             }

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

@@ -1243,6 +1243,9 @@
             <if test="distributeLevel != null">
                 distributeLevel=#{distributeLevel},
             </if>
+            <if test="unpackUseTime != null">
+                unpackUseTime=#{unpackUseTime},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>