From 3d861fd4daf6707dac510cae8cca2945b0ea9fe5 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 7 Nov 2024 10:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E7=BB=84=E8=A3=85=E4=BF=AE=E6=94=B9=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=BD=9C=E4=B8=BA=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adjust/AdjustInPluginInitializer.java     | 19 +++++++++---------
 .../adjust/AdjustInZZPluginInitializer.java   | 15 ++++++++------
 .../adjust/AdjustOutPluginInitializer.java    | 20 +++++++++----------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java
index cd7749a3..a90214d8 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java
@@ -269,7 +269,8 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
     public void implement(List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders) {
         for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) {
             String mapStr = "";
-            String format = "";
+            String create = "";
+            String modify = "";
             String response = "";
             String ofsCode = "";
             String ofsId = "";
@@ -296,15 +297,15 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 //vnote--备注
                 parentvo.setVnote(ofsHeader.getNote());
                 //dbilldate--单据日期--oms入库时间
-//                Date created = ofsHeader.getCreated();
-//                format = DateUtil.format(created, "yyyy-MM-dd HH:mm:ss");
-                format = ofsHeader.getCreated();
-                parentvo.setDbilldate(StringUtils.substring(format, 0, 10));
+                create = ofsHeader.getCreated();
+                modify = ofsHeader.getLastUpdated();
+//                parentvo.setDbilldate(StringUtils.substring(create, 0, 10));
+                parentvo.setDbilldate(StringUtils.substring(modify, 0, 10));
                 //coperatorid--制单人
                 String createdBy = ofsHeader.getCreatedBy();
                 parentvo.setCoperatorid("tbadmin");
                 //审核时间dauditdate
-                parentvo.setDauditdate(StringUtils.substring(format, 0, 10));
+                parentvo.setDauditdate(StringUtils.substring(modify, 0, 10));
 
                 //cdispatcherid--收发类别,
                 List<OFSAdjustOrderSearchResponse.OFSAdjustOrder> ofsAdjustOrders = queryOfsAdjustOrders(ofsHeader.getRefOrderCode());
@@ -332,7 +333,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                     GeneralBillVO_4ADto.Childrenvo children = new GeneralBillVO_4ADto.Childrenvo();
 
                     //dbizdate业务日期
-                    children.setDbizdate(format);
+                    children.setDbizdate(modify);
 
                     //存货档案id
                     children.setCinventoryid(ofsDetail.getSkuCode());
@@ -384,7 +385,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                 integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                 integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillId);
@@ -411,7 +412,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                 integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                 integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java
index 4c88317b..1c6dd706 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java
@@ -288,7 +288,8 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity {
     public void implement(List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders) {
         for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) {
             String mapStr = "";
-            String format = "";
+            String create = "";
+            String modify = "";
             String response = "";
             String ofsCode = "";
             try {
@@ -306,8 +307,10 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity {
 
                 parentvo.setPk_corp(bdCorpEntity.getPkCorp());
                 //dbilldate 单据日期
-                format = ofsHeader.getCreated();
-                parentvo.setDbilldate(StringUtils.substring(format, 0, 10));
+                create = ofsHeader.getCreated();
+                modify = ofsHeader.getLastUpdated();
+//                parentvo.setDbilldate(StringUtils.substring(create, 0, 10));
+                parentvo.setDbilldate(StringUtils.substring(modify, 0, 10));
                 //coperatorid 制单人
                 parentvo.setCoperatorid(OverallConstant.getOverAllValue("u8cApiZdrPK"));
                 //cinwarehouseid 入库仓库(审批,3.6及上版本支持)
@@ -402,7 +405,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity {
                         integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                         integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
                         integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                        integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                        integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                         integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode+"_"+detail.getSkuCode());
                         integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                         integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);
@@ -427,7 +430,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity {
                         integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                         integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
                         integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                        integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                        integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                         integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode+"_"+detail.getSkuCode());
                         integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                         integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
@@ -446,7 +449,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity {
                     integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                     integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
                     integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                    integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                    integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                     integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode+"_"+detail.getSkuCode());
                     integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                     integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java
index 60ba8be2..1c0066cc 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java
@@ -270,7 +270,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
     public void implement(List<StockoutOrderSearchResponse.StockoutOrder> filterStockoutOrders) {
         for (StockoutOrderSearchResponse.StockoutOrder stockoutOrder : filterStockoutOrders) {
             String mapStr = "";
-            String format = "";
+            String create = "";
+            String modify = "";
             String response = "";
             String ofsCode = "";
             String ofsId = "";
@@ -299,15 +300,14 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
                 //vnote--备注
                 parentvo.setVnote(ofsHeader.getShipmentNote());
                 //dbilldate--单据日期--oms入库时间
-                String created1 = ofsHeader.getCreated();
-//                Date created = ofsHeader.getCreated();
-//                format = DateUtil.format(created, "yyyy-MM-dd HH:mm:ss");
-                format = created1;
-                parentvo.setDbilldate(StringUtils.substring(format, 0, 10));
+                create = ofsHeader.getCreated();
+                modify = ofsHeader.getLastUpdated();
+//                parentvo.setDbilldate(StringUtils.substring(create, 0, 10));
+                parentvo.setDbilldate(StringUtils.substring(modify, 0, 10));
                 //coperatorid--制单人
                 parentvo.setCoperatorid("tbadmin");
                 //审核时间dauditdate
-                parentvo.setDauditdate(StringUtils.substring(format, 0, 10));
+                parentvo.setDauditdate(StringUtils.substring(modify, 0, 10));
 
                 //cdispatcherid--收发类别
                 List<OFSAdjustOrderSearchResponse.OFSAdjustOrder> ofsAdjustOrders = queryOfsAdjustOrders(ofsHeader.getRefOrderCode());
@@ -340,7 +340,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
                     GeneralBillVO_4IDto.Childrenvo children = new GeneralBillVO_4IDto.Childrenvo();
 
                     //dbizdate业务日期
-                    children.setDbizdate(format);
+                    children.setDbizdate(modify);
 
                     //存货档案id
                     children.setCinventoryid(ofsDetail.getSkuCode());
@@ -389,7 +389,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(attribute.getData());
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                 integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                 integrationTaskLivingDetailsEntity.setNewSystemNumber(ofsHeader.getCompanyCode()+"_"+vbillcode);//u8c其他出库单号
@@ -415,7 +415,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
-                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setBusinessDate(modify);
                 integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                 integrationTaskLivingDetailsEntity.setPluginId(getPluginId());