丽知：存其他出入库修改

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java

@@ -271,6 +271,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
             String format = "";
             String response = "";
             String ofsCode = "";
+            String ofsId = "";
             try {
                 //主表
                 StockinOrderSearchResponse.StockinOrder.StockinH ofsHeader = stockinOrder.getHeader();
@@ -278,6 +279,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 GeneralBillVO_4ADto.Parentvo parentvo = new GeneralBillVO_4ADto.Parentvo();
 
                 //ofs订单号，自定义项19
+                ofsId = ofsHeader.getId();
                 ofsCode = ofsHeader.getCode();
                 parentvo.setVuserdef19(ofsCode);
 
@@ -360,12 +362,14 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
 
                 boolean isSuccess = false;
                 String vbillcode = "";
+                String vbillId = "";
                 if ("success".equals(attribute.getStatus())) {
                     isSuccess = true;
                     String data = attribute.getData();
                     GeneralBillVO_4ADto resGeneralBillVO = resultDataHandle(data);
                     System.out.println(resGeneralBillVO);
                     vbillcode = resGeneralBillVO.getParentvo().getVbillcode();
+                    vbillId = resGeneralBillVO.getParentvo().getCgeneralhid();
                 }
                 if (!isSuccess) {
                     Assert.state(false, "推送U8C--> 丽知：OFS调整入库--->U8C其它入库 失败 接口返回结果：{} 接口入参:{}", response, mapStr);
@@ -378,10 +382,10 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
                 integrationTaskLivingDetailsEntity.setBusinessDate(format);
-                integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
+                integrationTaskLivingDetailsEntity.setRootAppPk(ofsId);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
-                integrationTaskLivingDetailsEntity.setRootAppBill(vbillcode);
+                integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillId);
-                integrationTaskLivingDetailsEntity.setDef1(vbillcode);
+                integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);
                 integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
                 saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);
 
@@ -399,7 +403,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
                 integrationTaskLivingDetailsEntity.setBusinessDate(format);
-                integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
+                integrationTaskLivingDetailsEntity.setRootAppPk(ofsId);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
                 integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
                 saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java

@@ -269,6 +269,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
             String format = "";
             String response = "";
             String ofsCode = "";
+            String ofsId = "";
             try {
                 GeneralBillVO_4IDto generalBillVO_4I = new GeneralBillVO_4IDto();
 
@@ -279,6 +280,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
 
 
                 //ofs订单号，自定义项19
+                ofsId = ofsHeader.getId();
                 ofsCode = ofsHeader.getCode();
                 parentvo.setVuserdef19(ofsCode);
 
@@ -367,12 +369,14 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
 
                 boolean isSuccess = false;
                 String vbillcode = "";
+                String vbillId = "";
                 if ("success".equals(attribute.getStatus())) {
                     isSuccess = true;
                     String data = attribute.getData();
                     GeneralBillVO_4IDto resGeneralBillVO = resultDataHandle(data);
                     System.out.println(resGeneralBillVO);
                     vbillcode = resGeneralBillVO.getParentvo().getVbillcode();
+                    vbillId = resGeneralBillVO.getParentvo().getCgeneralhid();
                 }
                 if (!isSuccess) {
                     Assert.state(false, "推送U8C--> 丽知：OFS调整出库--->U8C其它出库 失败 接口返回结果：{} 接口入参:{}", attribute.getErrormsg(), mapStr);
@@ -384,9 +388,9 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity {
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(attribute.getData());
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
                 integrationTaskLivingDetailsEntity.setBusinessDate(format);
-                integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
+                integrationTaskLivingDetailsEntity.setRootAppPk(ofsId);
                 integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
-                integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);//u8c其他出库单号
+                integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillId);//u8c其他出库单号
                 integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillcode);//u8c其他出库单号
                 integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
                 saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);

buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO_4ADto.java

@@ -21,6 +21,7 @@ public class GeneralBillVO_4ADto {
     @Data
     public static class Parentvo{
         private String vbillcode;//
+        private String cgeneralhid;//
         private String cwarehouseid;//
         private String pk_calbody;//库存组织
         private String pk_corp;//

buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/GeneralBillVO_4IDto.java

@@ -26,6 +26,7 @@ public class GeneralBillVO_4IDto {
          */
         private String isautopick;//自动拣货标识
         private String vbillcode;
+        private String cgeneralhid;
         private String dbilldate;
         private String cwarehouseid;
         private String pk_calbody;