Merge branch 'test'

src/main/java/com/glxp/api/controller/auth/InvBusUserController.java

@@ -128,8 +128,8 @@ public class InvBusUserController {
     @AuthRuleAnnotation("")
     @PostMapping("/spms/bus/user/warehouse/post")
     public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
+        invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
         if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
-            invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
             relBusRequset.getSelectActions().forEach(action ->
             {
                 InvBusUserEntity invBusUserEntity = new InvBusUserEntity();

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
@@ -16,6 +17,7 @@ import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.GennerOrderUtils;
+
 import com.glxp.api.util.udi.UdiInfoUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -206,6 +208,9 @@ public class UdiContrastService {
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid());
             if (udiProductEntity == null) {
+                for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
+                    udiInfoEntity.setId(IdUtil.getSnowflakeNextId());
+                }
                 udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
             }
         }

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -19,9 +19,9 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-
+//
-@Component
+//@Component
-@EnableScheduling
+//@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

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

@@ -229,7 +229,7 @@
 
     <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
         replace INTO basic_products
-        (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+        (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
         zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
         ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
         manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
@@ -241,7 +241,8 @@
 
         <foreach collection="udiInfoEntities" item="item" index="index"
                  separator=",">
-            (#{item.uuid},
+            (#{item.id},
+             #{item.uuid},
             #{item.originUuid},
             #{item.nameCode},
             #{item.deviceRecordKey},