Merge remote-tracking branch 'origin/master'

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IoCodeLostEntity.java

@@ -0,0 +1,90 @@
+package com.glxp.sale.admin.entity.sync;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 扫码缺失字段信息补齐表
+ */
+@Data
+public class IoCodeLostEntity {
+    private Integer id;
+
+    /**
+     * UDI码
+     */
+    private String code;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 供应商
+     */
+    private String supId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    private String nameCode;
+
+    private String cpmctymc;
+
+    private String ggxh;
+
+    private String startTime;
+
+    private String endTime;
+
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_BATCHNO = "batchNo";
+
+    public static final String COL_PRODUCEDATE = "produceDate";
+
+    public static final String COL_EXPIREDATE = "expireDate";
+
+    public static final String COL_SERIALNO = "serialNo";
+
+    public static final String COL_SUPID = "supId";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_REMARK = "remark";
+}

api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncDataResponse.java

@@ -52,6 +52,8 @@ public class SpsSyncDataResponse {
     List<SupCertEntity> supCertEntities;
     List<SupCertSetEntity> supCertSetEntities;
 
+    List<IoCodeLostEntity> ioCodeLostEntities;
+
     @Override
     public String toString() {
         StringBuffer remark = new StringBuffer();
@@ -131,6 +133,11 @@ public class SpsSyncDataResponse {
         if (CollUtil.isNotEmpty(supCertSetEntities)) {
             remark.append("证书设置：").append(supCertSetEntities.size()).append(" 条\n");
         }
+
+        if (CollUtil.isNotEmpty(ioCodeLostEntities)) {
+            remark.append("UDI缺失码：").append(ioCodeLostEntities.size()).append(" 条\n");
+        }
+
         return remark.toString();
     }
 }

api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncIdcTask.java

@@ -48,7 +48,7 @@ public class AsyncIdcTask implements SchedulingConfigurer {
     private void process() {
     	logger.info("syncIdc----process------------");
 
-       idcService.asyncIdcTask();
+//       idcService.asyncIdcTask();
      }
 
 }

api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java

@@ -86,7 +86,8 @@ public class DlAllDataService {
                                         || CollUtil.isNotEmpty(syncOrderResponse.getSupManufacturerEntities())
                                         || CollUtil.isNotEmpty(syncOrderResponse.getSupProductEntities())
                                         || CollUtil.isNotEmpty(syncOrderResponse.getSupCertEntities())
-                                        || CollUtil.isNotEmpty(syncOrderResponse.getSupCertSetEntities()))
+                                        || CollUtil.isNotEmpty(syncOrderResponse.getSupCertSetEntities()) || CollUtil.isNotEmpty(syncOrderResponse.getIoCodeLostEntities())
+                                )
 
                         ) {
 

api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java

@@ -21,7 +21,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
-
+//@Component
+//@EnableScheduling
 public class HeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(HeartTask.class);