丽知：sku查询,sku分类查询修改

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofsvo/QueryOfsSKUClassRequestVO.java

@@ -0,0 +1,23 @@
+package com.hzya.frame.plugin.lets.ofsvo;
+
+import lombok.Data;
+
+/**
+ * OFS SKU分类查询请求类
+ */
+@Data
+public class QueryOfsSKUClassRequestVO {
+    /** 开始时间 */
+    private String created_start;
+    /** 结束时间 */
+    private String created_end;
+    /** 组织 */
+    private String clientCode;
+
+    private String companyCode;
+    private String cInvCCode;
+    private String status;
+    private String code;
+    private int pageNo;
+    private int pageSize;
+}

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java

@@ -10,14 +10,17 @@ import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.plugin.lets.constant.OverallConstant;
 import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant;
 import com.hzya.frame.plugin.lets.entity.BdInvclEntity;
-import com.hzya.frame.plugin.lets.plugin.sales.SoSaleOutPluginInitializerToC;
+import com.hzya.frame.plugin.lets.ofsvo.QueryOfsSKUClassRequestVO;
 import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto;
 import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil;
 import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil;
 import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
 import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.ttxofs.basics.ReturnMessageBasics;
+import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto;
+import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUClassSearchResponse;
+import com.hzya.frame.ttxofs.service.OfsUnifiedService;
 import com.hzya.frame.web.entity.JsonResultEntity;
-import com.zaxxer.hikari.util.FastList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,13 +40,12 @@ import org.springframework.beans.factory.annotation.Autowired;
  *          三级：AA00101自动识别为AA001的下级
  */
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class GoodsClassPluginInitializer extends PluginBaseEntity {
+public class SKUClassPluginInitializer extends PluginBaseEntity {
 
-    Logger logger = LoggerFactory.getLogger(GoodsClassPluginInitializer.class);
+    Logger logger = LoggerFactory.getLogger(SKUClassPluginInitializer.class);
 
     private static final ReentrantLock LOCK = new ReentrantLock(true);
 
@@ -59,7 +61,7 @@ public class GoodsClassPluginInitializer extends PluginBaseEntity {
 
     @Override
     public String getPluginId() {
-        return "com.hzya.frame.plugin.lets.plugin.base.GoodsClassPluginInitializer";
+        return "com.hzya.frame.plugin.lets.plugin.base.SKUClassPluginInitializer";
     }
 
     @Override
@@ -83,6 +85,8 @@ public class GoodsClassPluginInitializer extends PluginBaseEntity {
     private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao;
     @Autowired
     private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
+    @Autowired
+    private OfsUnifiedService ofsUnifiedService;
 
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
@@ -99,8 +103,19 @@ public class GoodsClassPluginInitializer extends PluginBaseEntity {
             Date currentDate = new Date();
             Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10);
             Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2);
-            String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss" + ".000");
+            String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss");
-            String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss" + ".000");
+            String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss");
+
+            QueryOfsSKUClassRequestVO queryOfsSKUClassRequestVO = new QueryOfsSKUClassRequestVO();
+//            queryOfsSKUClassRequestVO.setCreated_start(start);
+//            queryOfsSKUClassRequestVO.setCreated_end(end);
+            queryOfsSKUClassRequestVO.setClientCode("LETS");
+            queryOfsSKUClassRequestVO.setPageNo(1);
+            queryOfsSKUClassRequestVO.setPageSize(500);
+            List<OFSSKUClassSearchResponse.SKUClass> skuClasses = querySkuClass(queryOfsSKUClassRequestVO);
+            System.out.println(skuClasses);
+
+
         } catch (Exception e) {
             logger.error("丽知：OFS货品档案分类--->U8C货品档案分类,start()方法报错：", e);
         }
@@ -126,6 +141,16 @@ public class GoodsClassPluginInitializer extends PluginBaseEntity {
             Date business_end = DateUtil.parse(endTime);
             String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00";
             String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59";
+
+
+            QueryOfsSKUClassRequestVO queryOfsSKUClassRequestVO = new QueryOfsSKUClassRequestVO();
+            queryOfsSKUClassRequestVO.setCreated_start(start);
+            queryOfsSKUClassRequestVO.setCreated_end(end);
+            queryOfsSKUClassRequestVO.setClientCode("LETS");
+            queryOfsSKUClassRequestVO.setPageNo(1);
+            queryOfsSKUClassRequestVO.setPageSize(500);
+            querySkuClass(queryOfsSKUClassRequestVO);
+
         } catch (Exception e) {
             logger.error("丽知：OFS货品档案分类--->U8C货品档案分类,start(String startTime, String endTime)方法报错：", e);
         }
@@ -228,5 +253,23 @@ public class GoodsClassPluginInitializer extends PluginBaseEntity {
 
     }
 
+    /**
+     * OFS存货分类查询
+     */
+    public List<OFSSKUClassSearchResponse.SKUClass> querySkuClass(QueryOfsSKUClassRequestVO queryOfsSKUClassRequestVO) throws Exception {
+        InterfaceParamByU8CApiDto interfaceParamDto = new InterfaceParamByU8CApiDto();
+        interfaceParamDto.setApi("ofs.inventory.class.search");
+        queryOfsSKUClassRequestVO.setClientCode("LETS");
+        interfaceParamDto.setData(JSON.toJSONString(queryOfsSKUClassRequestVO));
+        OFSSKUClassSearchResponse ofsskuClassSearchResponse =(OFSSKUClassSearchResponse) ofsUnifiedService.unifiedByU8CApi(interfaceParamDto);
+        System.out.println(ofsskuClassSearchResponse);
+        List<OFSSKUClassSearchResponse.SKUClass> data = ofsskuClassSearchResponse.getData();
+        if(data==null||data.size()==0){
+            return null;
+        }
+
+        return data;
+    }
+
 
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java

@@ -11,7 +11,6 @@ import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil;
 import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
 import com.hzya.frame.ttxofs.basics.ReturnMessageBasics;
 import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto;
-import com.hzya.frame.ttxofs.dto.InterfaceParamDto;
 import com.hzya.frame.ttxofs.service.OfsUnifiedService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
@@ -30,9 +29,9 @@ import java.util.concurrent.locks.ReentrantLock;
  * 存货基本档案封存     /u8cloud/api/uapbd/invbasdoc/seal
  * 存货基本档案取消封存  /u8cloud/api/uapbd/invbasdoc/unseal
  */
-public class GoodsPluginInitializer extends PluginBaseEntity {
+public class SKUPluginInitializer extends PluginBaseEntity {
 
-    Logger logger = LoggerFactory.getLogger(GoodsPluginInitializer.class);
+    Logger logger = LoggerFactory.getLogger(SKUPluginInitializer.class);
 
     private static final ReentrantLock LOCK = new ReentrantLock(true);
 
@@ -94,11 +93,11 @@ public class GoodsPluginInitializer extends PluginBaseEntity {
             String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss");
 
             QueryOfsSKURequestVO queryOfsSKURequestVO = new QueryOfsSKURequestVO();
-            queryOfsSKURequestVO.setCreated_start(startTimeStr);
+//            queryOfsSKURequestVO.setCreated_start(startTimeStr);
-            queryOfsSKURequestVO.setCreated_end(endTimeStr);
+//            queryOfsSKURequestVO.setCreated_end(endTimeStr);
-            queryOfsSKURequestVO.setCreated_start("2023-10-17 00:00:00");
+//            queryOfsSKURequestVO.setCreated_start("2023-10-15 00:00:00");
-            queryOfsSKURequestVO.setCreated_end("2023-10-17 23:59:59");
+//            queryOfsSKURequestVO.setCreated_end("2023-10-21 23:59:59");
-            queryOfsSKURequestVO.setCompanyCode("YX");
+//            queryOfsSKURequestVO.setCompanyCode("");
             queryOfsSKURequestVO.setPageNo(1);
             queryOfsSKURequestVO.setPageSize(500);
             queryOfsSKUs(queryOfsSKURequestVO);

service/src/main/java/com/hzya/frame/ttxofs/dto/ofsBaseSearch/OFSSKUClassSearchResponse.java

@@ -3,9 +3,25 @@ package com.hzya.frame.ttxofs.dto.ofsBaseSearch;
 import com.hzya.frame.ttxofs.basics.ReturnMessageBasics;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * OFS SKU查询返回
  */
 @Data
 public class OFSSKUClassSearchResponse extends ReturnMessageBasics {
+    List<SKUClass> data;
+    @Data
+    public static class SKUClass {
+        private String id;
+        private String clientCode;
+        private String cInvCCode;
+        private String cInvCName;
+        private Date created;
+        private String createdBy;
+        private Date lastUpdated;
+        private String lastUpdatedBy;
+    }
+
 }

service/src/main/java/com/hzya/frame/ttxofs/dto/ofsBaseSearch/OFSSKUSearchResponse.java

@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Data
 public class OFSSKUSearchResponse extends ReturnMessageBasics {
-    private List<OFSSKU> skuList;
+    private List<OFSSKU> data;
 
     @Data
     public static class OFSSKU{