Merge remote-tracking branch 'origin/lets' into lets

# Conflicts:
#	buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
#	buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-sowow-plugin.xml

buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java

@@ -40,6 +40,10 @@ public class OverallConstant {
         //调拨
         prodOverPublic.put("approveqz", "/u8cloud/api/to/transorder/saveapprove");//调拨订单保存即审批
 
+        //其他出入库
+        prodOverPublic.put("otherinqz", "/u8cloud/api/ic/otherin/save/sign");//库存其他入库保存即签字
+
+
 
 
         prodOverPublic.put("custdocSave", "/u8cloud/api/uapbd/custdoc/insert");//客商档案新增

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.java

@@ -149,10 +149,21 @@ public class TocofsReturngoodsDetailedEntity extends BaseEntity {
      * 业务日期
      */
     private String businessDate;
+
     /**
      * 主表主键
      */
-    private String returngoodsId;
+//    private String returngoodsId;
+
+    private String businessType;
+
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType;
+    }
 
     public String getReceiptId() {
         return receiptId;
@@ -434,12 +445,12 @@ public class TocofsReturngoodsDetailedEntity extends BaseEntity {
         this.businessDate = businessDate;
     }
 
-    public String getReturngoodsId() {
+//    public String getReturngoodsId() {
-        return returngoodsId;
+//        return returngoodsId;
-    }
+//    }
-
+//
-    public void setReturngoodsId(String returngoodsId) {
+//    public void setReturngoodsId(String returngoodsId) {
-        this.returngoodsId = returngoodsId;
+//        this.returngoodsId = returngoodsId;
-    }
+//    }
 
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsReturngoodsDetailedEntity.xml

@@ -39,8 +39,9 @@
            <result property="newSystemPrimary" column="new_system_primary" jdbcType="VARCHAR"/>
            <result property="primaryKey" column="primary_key" jdbcType="VARCHAR"/>
            <result property="businessDate" column="business_date" jdbcType="VARCHAR"/>
-           <result property="returngoodsId" column="returngoods_id" jdbcType="VARCHAR"/>
+           <result property="businessType" column="business_type" jdbcType="VARCHAR"/>
         </resultMap>
+
     <!-- 查询的字段-->
     <sql id = "TocofsReturngoodsDetailedEntity_Base_Column_List">
         id
@@ -78,9 +79,10 @@
         ,new_system_number 
         ,new_system_primary 
         ,primary_key 
-        ,business_date 
+        ,business_date
-        ,returngoods_id 
+        ,business_type
      </sql>
+
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-TocofsReturngoodsDetailedEntity-result" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity">
     select
@@ -123,7 +125,7 @@
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> and primary_key = #{primaryKey} </if>
             <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="returngoodsId != null and returngoodsId != ''"> and returngoods_id = #{returngoodsId} </if>
+            <if test="businessType != null and businessType != ''"> and business_type = #{businessType} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -170,7 +172,7 @@
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> and primary_key = #{primaryKey} </if>
             <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="returngoodsId != null and returngoodsId != ''"> and returngoods_id = #{returngoodsId} </if>
+            <if test="businessType != null and businessType != ''"> and business_type = #{businessType} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -219,7 +221,7 @@
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary like concat('%',#{newSystemPrimary},'%') </if>
             <if test="primaryKey != null and primaryKey != ''"> and primary_key like concat('%',#{primaryKey},'%') </if>
             <if test="businessDate != null and businessDate != ''"> and business_date like concat('%',#{businessDate},'%') </if>
-            <if test="returngoodsId != null and returngoodsId != ''"> and returngoods_id like concat('%',#{returngoodsId},'%') </if>
+            <if test="businessType != null and businessType != ''"> and business_type like concat('%',#{businessType},'%') </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -268,7 +270,7 @@
              <if test="newSystemPrimary != null and newSystemPrimary != ''"> or new_system_primary = #{newSystemPrimary} </if>
              <if test="primaryKey != null and primaryKey != ''"> or primary_key = #{primaryKey} </if>
              <if test="businessDate != null and businessDate != ''"> or business_date = #{businessDate} </if>
-             <if test="returngoodsId != null and returngoodsId != ''"> or returngoods_id = #{returngoodsId} </if>
+             <if test="businessType != null and businessType != ''"> or business_type = #{businessType} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
@@ -315,7 +317,7 @@
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary , </if>
             <if test="primaryKey != null and primaryKey != ''"> primary_key , </if>
             <if test="businessDate != null and businessDate != ''"> business_date , </if>
-            <if test="returngoodsId != null and returngoodsId != ''"> returngoods_id , </if>
+            <if test="businessType != null and businessType != ''"> business_type , </if>
             <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
@@ -357,7 +359,7 @@
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> #{newSystemPrimary} ,</if>
             <if test="primaryKey != null and primaryKey != ''"> #{primaryKey} ,</if>
             <if test="businessDate != null and businessDate != ''"> #{businessDate} ,</if>
-            <if test="returngoodsId != null and returngoodsId != ''"> #{returngoodsId} ,</if>
+            <if test="businessType != null and businessType != ''"> #{businessType} ,</if>
             <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from tocofs_returngoods_detailed a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
@@ -365,28 +367,28 @@
 </insert>
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-      insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date, returngoods_id,  sts)
+      insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.returngoodsId}, 'Y')
+        (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType})
         </foreach>
     </insert>
 
     <!-- 批量新增 -->
     <insert id="entityInsertBatchV2" keyProperty="id" useGeneratedKeys="true">
-        insert IGNORE into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date, returngoods_id)
+        insert IGNORE into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.returngoodsId})
+            (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType})
         </foreach>
     </insert>
 
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-    insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date, returngoods_id)
+    insert into tocofs_returngoods_detailed(receipt_id, receipt_code, ref_order_id, ref_order_detail_id, source_order_code, client_code, company_code, facility_code, sku_code, sku_name, request_qty, received_qty, open_qty, quantity_u_m, total_weight, total_volume, total_volume_weight, total_amount, weight_u_m, volume_u_m, inventory_sts, in_trans_inv_id, closed, created, created_by, last_updated, last_updated_by, discount_price, new_transmitInfo, new_pushDate, new_state, new_system_number, new_system_primary, primary_key, business_date,business_type)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.returngoodsId})
+    (#{entity.receiptId},#{entity.receiptCode},#{entity.refOrderId},#{entity.refOrderDetailId},#{entity.sourceOrderCode},#{entity.clientCode},#{entity.companyCode},#{entity.facilityCode},#{entity.skuCode},#{entity.skuName},#{entity.requestQty},#{entity.receivedQty},#{entity.openQty},#{entity.quantityUM},#{entity.totalWeight},#{entity.totalVolume},#{entity.totalVolumeWeight},#{entity.totalAmount},#{entity.weightUM},#{entity.volumeUM},#{entity.inventorySts},#{entity.inTransInvId},#{entity.closed},#{entity.created},#{entity.createdBy},#{entity.lastUpdated},#{entity.lastUpdatedBy},#{entity.discountPrice},#{entity.newTransmitinfo},#{entity.newPushdate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessDate},#{entity.businessType})
     </foreach>
     on duplicate key update
     receipt_id = values(receipt_id),
@@ -424,7 +426,9 @@
     new_system_primary = values(new_system_primary),
     primary_key = values(primary_key),
     business_date = values(business_date),
-    returngoods_id = values(returngoods_id)</insert>
+    business_type = values(business_type)
+</insert>
+
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity" >
 update tocofs_returngoods_detailed  set
@@ -464,15 +468,17 @@ update tocofs_returngoods_detailed  set
   <if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary = #{newSystemPrimary},</if>
   <if test="primaryKey != null and primaryKey != ''"> primary_key = #{primaryKey},</if>
   <if test="businessDate != null and businessDate != ''"> business_date = #{businessDate},</if>
-  <if test="returngoodsId != null and returngoodsId != ''"> returngoods_id = #{returngoodsId},</if>
+  <if test="businessType != null and businessType != ''"> business_type = #{businessType}</if>
 </trim>
 where id = #{id}
 </update>
+
 <!-- 逻辑删除 -->
 <update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity" >
 update tocofs_returngoods_detailed  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
 where id = #{id}
 </update>
+
 <!-- 多条件逻辑删除 -->
 <update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsReturngoodsDetailedEntity" >
 update tocofs_returngoods_detailed  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
@@ -513,10 +519,11 @@ update tocofs_returngoods_detailed  set sts= 'N' ,modify_time = #{modify_time},m
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> and primary_key = #{primaryKey} </if>
             <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="returngoodsId != null and returngoodsId != ''"> and returngoods_id = #{returngoodsId} </if>
+            <if test="businessType != null and businessType != ''"> and business_type = #{businessType} </if>
             and sts='Y'
     </trim>
 </update>
+
 <!--通过主键删除-->
 <delete id="entity_delete">
     delete from tocofs_returngoods_detailed where id = #{id}

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml

@@ -38,9 +38,12 @@
            <result property="newState" column="newState" jdbcType="VARCHAR"/>
            <result property="newSystemNumber" column="newSystemNumber" jdbcType="VARCHAR"/>
            <result property="newSystemPrimary" column="newSystemPrimary" jdbcType="VARCHAR"/>
+
            <result property="primaryKey" column="primaryKey" jdbcType="VARCHAR"/>
+           <result property="businessType" column="businessType" jdbcType="VARCHAR"/>
            <result property="businessDate" column="businessDate" jdbcType="VARCHAR"/>
         </resultMap>
+
     <!-- 查询的字段-->
     <sql id = "TocofsSaleoutDetailedEntity_Base_Column_List">
         clientCode
@@ -77,7 +80,10 @@
         ,newSystemNumber
         ,newSystemPrimary
         ,primaryKey
+        ,businessType
+        ,businessDate
      </sql>
+
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-TocofsSaleoutDetailedEntity-result" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity">
     select
@@ -120,6 +126,8 @@
             <if test="newSystemNumber != null and newSystemNumber != ''"> and newSystemNumber = #{newSystemNumber} </if>
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and newSystemPrimary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> and primaryKey = #{primaryKey} </if>
+            <if test="businessType != null and businessType != ''"> and businessType = #{businessType} </if>
+            <if test="businessDate != null and businessDate != ''"> and businessDate = #{businessDate} </if>
     </trim>
 <!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
 <!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
@@ -165,6 +173,8 @@
             <if test="newSystemNumber != null and newSystemNumber != ''"> and newSystemNumber = #{newSystemNumber} </if>
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and newSystemPrimary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> and primaryKey = #{primaryKey} </if>
+            <if test="businessType != null and businessType != ''"> and businessType = #{businessType} </if>
+            <if test="businessDate != null and businessDate != ''"> and businessDate = #{businessDate} </if>
     </trim>
 <!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
 <!--    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>-->
@@ -212,6 +222,8 @@
             <if test="newSystemNumber != null and newSystemNumber != ''"> and newSystemNumber like concat('%',#{newSystemNumber},'%') </if>
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> and newSystemPrimary like concat('%',#{newSystemPrimary},'%') </if>
             <if test="primaryKey != null and primaryKey != ''"> and primaryKey like concat('%',#{primaryKey},'%') </if>
+            <if test="businessType != null and businessType != ''"> and businessType like concat('%',#{businessType},'%') </if>
+            <if test="businessDate != null and businessDate != ''"> and businessDate like concat('%',#{businessDate},'%') </if>
     </trim>
 <!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
 <!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
@@ -259,6 +271,8 @@
             <if test="newSystemNumber != null and newSystemNumber != ''"> or newSystemNumber = #{newSystemNumber} </if>
             <if test="newSystemPrimary != null and newSystemPrimary != ''"> or newSystemPrimary = #{newSystemPrimary} </if>
             <if test="primaryKey != null and primaryKey != ''"> or primaryKey = #{primaryKey} </if>
+            <if test="businessType != null and businessType != ''"> or businessType = #{businessType} </if>
+            <if test="businessDate != null and businessDate != ''"> or businessDate = #{businessDate} </if>
     </trim>
 <!--    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>-->
 <!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
@@ -348,19 +362,19 @@
 
 <!-- 批量新增 -->
 <insert id="entityInsertBatchV2" keyProperty="refOrderDetailId" useGeneratedKeys="true">
-    insert IGNORE into tocofs_saleout_detailed(clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, inventorySts, isGift, requestQty, shipQty, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy,newTransmitInfo,newPushDate,newState,newSystemNumber,newSystemPrimary,primaryKey)
+    insert IGNORE into tocofs_saleout_detailed(clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, inventorySts, isGift, requestQty, shipQty, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy,newTransmitInfo,newPushDate,newState,newSystemNumber,newSystemPrimary,primaryKey,businessType,businessDate)
     values
     <foreach collection="list" item="entity" separator=",">
-        (#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey})
+        (#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessType},#{entity.businessDate})
     </foreach>
 </insert>
 
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch" keyProperty="rootid" useGeneratedKeys="true">
-    insert into tocofs_saleout_detailed(clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, inventorySts, isGift, requestQty, shipQty, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy,newTransmitInfo,newPushDate,newState,newSystemNumber,newSystemPrimary,primaryKey)
+    insert into tocofs_saleout_detailed(clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, inventorySts, isGift, requestQty, shipQty, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy,newTransmitInfo,newPushDate,newState,newSystemNumber,newSystemPrimary,primaryKey,businessType,businessDate)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdatedby},#{entity.lastupdated},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey})
+    (#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdatedby},#{entity.lastupdated},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.newState},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.primaryKey},#{entity.businessType},#{entity.businessDate})
     </foreach>
     on duplicate key update
     clientCode = values(clientCode),
@@ -396,8 +410,11 @@
     newState = values(newState),
     newSystemNumber = values(newSystemNumber),
     newSystemPrimary = values(newSystemPrimary),
-    primaryKey = values(primaryKey)
+    primaryKey = values(primaryKey),
+    businessType = values(businessType),
+    businessDate = values(businessDate)
 </insert>
+
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity" >
 update tocofs_saleout_detailed  set
@@ -436,6 +453,8 @@ update tocofs_saleout_detailed  set
     <if test="newSystemNumber != null and newSystemNumber != ''"> newSystemNumber = #{newSystemNumber},</if>
     <if test="newSystemPrimary != null and newSystemPrimary != ''"> newSystemPrimary = #{newSystemPrimary},</if>
     <if test="primaryKey != null and primaryKey != ''"> primaryKey = #{primaryKey},</if>
+    <if test="businessType != null and businessType != ''"> businessType = #{businessType},</if>
+    <if test="businessDate != null and businessDate != ''"> businessDate = #{businessDate}</if>
 </trim>
 where rootId = #{rootid}
 </update>
@@ -484,6 +503,8 @@ update tocofs_saleout_detailed  set sts= 'N' ,modify_time = #{modify_time},modif
      <if test="newSystemNumber != null and newSystemNumber != ''"> and newSystemNumber = #{newSystemNumber} </if>
      <if test="newSystemPrimary != null and newSystemPrimary != ''"> and newSystemPrimary = #{newSystemPrimary} </if>
      <if test="primaryKey != null and primaryKey != ''"> and primaryKey = #{primaryKey} </if>
+     <if test="businessType != null and businessType != ''"> and businessType = #{businessType} </if>
+     <if test="businessDate != null and businessDate != ''"> and businessDate = #{businessDate} </if>
 </trim>
 </update>
 <!--通过主键删除-->

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

@@ -2,6 +2,9 @@ package com.hzya.frame.plugin.lets.ofsvo;
 
 import lombok.Data;
 
+/**
+ * OFS调整入库请求类
+ */
 @Data
 public class QueryOfsStockinOrderRequestVO {
     /** 开始时间 */

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

@@ -2,6 +2,9 @@ package com.hzya.frame.plugin.lets.ofsvo;
 
 import lombok.Data;
 
+/**
+ * OFS调拨订单查询请求类
+ */
 @Data
 public class QueryOfsTransferOrderRequestVO {
     /** 开始时间 */

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

@@ -2,13 +2,23 @@ package com.hzya.frame.plugin.lets.plugin.adjust;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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.dao.IBdRdclDao;
+import com.hzya.frame.plugin.lets.entity.BdRdclEntity;
 import com.hzya.frame.plugin.lets.ofsvo.QueryOfsStockinOrderRequestVO;
+import com.hzya.frame.plugin.lets.u8cdto.BillVO;
+import com.hzya.frame.plugin.lets.u8cdto.GeneralBillVO_4ADto;
+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.dto.InterfaceParamDto;
 import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse;
 import com.hzya.frame.ttxofs.service.OfsUnifiedService;
@@ -67,6 +77,9 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
     @Autowired
     private OfsUnifiedService ofsUnifiedService;
 
+    @Autowired
+    private IBdRdclDao iBdRdclDao;
+
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
         return null;
@@ -86,18 +99,26 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
             String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss");
 
             QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO();
-            queryOfsStockinOrderRequestVO.setCreated_start("2024-08-05 00:00:00");
+            queryOfsStockinOrderRequestVO.setCreated_start(startTimeStr);
-            queryOfsStockinOrderRequestVO.setCreated_end("2024-08-09 23:59:59");
+            queryOfsStockinOrderRequestVO.setCreated_end(endTimeStr);
-            queryOfsStockinOrderRequestVO.setCompanyCode("SHXM");
+            queryOfsStockinOrderRequestVO.setCompanyCode("SHLZ");
 //            queryOfsTransferOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库
             queryOfsStockinOrderRequestVO.setPageNo(1L);
             queryOfsStockinOrderRequestVO.setPageSize(500L);
-            List<StockinOrderSearchResponse.StockinOrder> data = queryOfsStockinOrder(queryOfsStockinOrderRequestVO);
+            List<StockinOrderSearchResponse.StockinOrder> stockinOrders = queryOfsStockinOrder(queryOfsStockinOrderRequestVO);
-            System.out.println(data);
+            System.out.println(stockinOrders);
 
+            if (stockinOrders.size() == 0) {
+                return;
+            }
             //过滤日志
+            List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders = filterData(stockinOrders);
+            if (filterStockinOrders.size() == 0) {
+                return;
+            }
 
             //推送
+            implement(filterStockinOrders);
 
 
         } catch (Exception e) {
@@ -110,6 +131,30 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
      */
     public void start(String stockinNo) {
         try {
+
+            QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO();
+            queryOfsStockinOrderRequestVO.setCreated_start("2024-08-12 00:00:00");
+            queryOfsStockinOrderRequestVO.setCreated_end("2024-08-13 23:59:59");
+            queryOfsStockinOrderRequestVO.setCode(stockinNo);
+            queryOfsStockinOrderRequestVO.setCompanyCode("SHLZ");
+//            queryOfsTransferOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库
+            queryOfsStockinOrderRequestVO.setPageNo(1L);
+            queryOfsStockinOrderRequestVO.setPageSize(500L);
+            List<StockinOrderSearchResponse.StockinOrder> stockinOrders = queryOfsStockinOrder(queryOfsStockinOrderRequestVO);
+            System.out.println(stockinOrders);
+
+            if (stockinOrders.size() == 0) {
+                return;
+            }
+            //过滤日志
+            List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders = filterData(stockinOrders);
+            if (filterStockinOrders.size() == 0) {
+                return;
+            }
+
+            //推送
+            implement(filterStockinOrders);
+
         } catch (Exception e) {
             logger.error("丽知：OFS调整入库--->U8C其它入库,start(String goodsName)方法报错：", e);
         }
@@ -125,11 +170,190 @@ public class AdjustInPluginInitializer 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";
+
+            QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO();
+            queryOfsStockinOrderRequestVO.setCreated_start(start);
+            queryOfsStockinOrderRequestVO.setCreated_end(end);
+            queryOfsStockinOrderRequestVO.setCompanyCode("SHOFF");
+//            queryOfsTransferOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库
+            queryOfsStockinOrderRequestVO.setPageNo(1L);
+            queryOfsStockinOrderRequestVO.setPageSize(500L);
+            List<StockinOrderSearchResponse.StockinOrder> stockinOrders = queryOfsStockinOrder(queryOfsStockinOrderRequestVO);
+            System.out.println(stockinOrders);
+
+            if (stockinOrders.size() == 0) {
+                return;
+            }
+            //过滤日志
+            List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders = filterData(stockinOrders);
+            if (filterStockinOrders.size() == 0) {
+                return;
+            }
+
+            //推送
+            implement(filterStockinOrders);
+
+
         } catch (Exception e) {
             logger.error("丽知：OFS调整入库--->U8C其它入库,start(String startTime, String endTime)方法报错：", e);
         }
     }
 
+    /**
+     * 过滤成功日志
+     *
+     * @return
+     */
+    public List<StockinOrderSearchResponse.StockinOrder> filterData(List<StockinOrderSearchResponse.StockinOrder> stockinOrders) {
+        List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders = new ArrayList<>();
+        for (StockinOrderSearchResponse.StockinOrder stockinOrder : stockinOrders) {
+            StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader();
+            String rootAppPk = header.getCode();
+            boolean isExis = true;
+            IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+            integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);
+            integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+            integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+            List<IntegrationTaskLivingDetailsEntity> integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity);
+            if (integrationTaskLivingDetailsEntities == null || integrationTaskLivingDetailsEntities.size() == 0) {
+                isExis = false;
+            }
+            if (!isExis) {
+                filterStockinOrders.add(stockinOrder);
+            }
+        }
+        return filterStockinOrders;
+    }
+
+    /**
+     * 推送U8C其它入库单
+     * @param filterStockinOrders
+     */
+    public void implement(List<StockinOrderSearchResponse.StockinOrder> filterStockinOrders){
+        for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) {
+            String mapStr = "";
+            String format="";
+            String response="";
+            String ofsCode="";
+            try{
+                //主表
+                StockinOrderSearchResponse.StockinOrder.StockinH ofsHeader = stockinOrder.getHeader();
+                GeneralBillVO_4ADto generalBillVO_4A = new GeneralBillVO_4ADto();
+                GeneralBillVO_4ADto.Parentvo parentvo = new GeneralBillVO_4ADto.Parentvo();
+
+                //ofs订单号，自定义项19
+                ofsCode=ofsHeader.getCode();
+                parentvo.setVuserdef19(ofsCode);
+
+                //pk_corp--公司
+                parentvo.setPk_corp(ofsHeader.getCompanyCode());
+                //pk_calbody--库存组织PK
+                parentvo.setPk_calbody(ofsHeader.getCompanyCode());
+                //cwarehouseid--仓库
+                parentvo.setCwarehouseid(ofsHeader.getFacilityCode());
+
+                //vnote--备注
+                parentvo.setVnote(ofsHeader.getNote());
+                //dbilldate--单据日期--oms入库时间
+                Date created = ofsHeader.getCreated();
+                format = DateUtil.format(created, "yyyy-MM-dd HH:mm:ss");
+                parentvo.setDbilldate(format);
+                //coperatorid--制单人
+                String createdBy = ofsHeader.getCreatedBy();
+                parentvo.setCoperatorid("tbadmin");
+                //审核时间dauditdate
+                parentvo.setDauditdate(format);
+
+                //cdispatcherid--收发类别，ofs过来的写死，20240813（妮姐+万万），就是调整出库，调整入库
+                BdRdclEntity bdRdclEntity = new BdRdclEntity();
+                bdRdclEntity.setRdname("调整入库");
+                bdRdclEntity.setDr(0);
+                bdRdclEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+                List<BdRdclEntity> BdRdclEntityList = iBdRdclDao.query(bdRdclEntity);
+                if(BdRdclEntityList.size()==0){
+                    Assert.state(false,"查询U8C收发类型：调整入库失败。未查询到U8C收发类型。");
+                }
+                String RdclCode = BdRdclEntityList.get(0).getRdcode();//收发类别编码
+                parentvo.setCdispatcherid(RdclCode);
+
+                //子表
+                List<GeneralBillVO_4ADto.Childrenvo> childrenvo=new ArrayList<>();
+                for (StockinOrderSearchResponse.StockinOrder.StockinB ofsDetail : stockinOrder.getDetails()) {
+                    System.out.println(ofsDetail);
+                    GeneralBillVO_4ADto.Childrenvo children = new GeneralBillVO_4ADto.Childrenvo();
+
+                    //dbizdate业务日期
+                    children.setDbizdate(format);
+
+                    //存货档案id
+                    children.setCinventoryid(ofsDetail.getSkuCode());
+
+                    //nshouldinnum--应入数量
+                    children.setNshouldinnum(String.valueOf(ofsDetail.getRequestQty()));
+
+                    //nintnum--实入数量
+                    children.setNinnum(String.valueOf(ofsDetail.getReceivedQty()));
+
+                    childrenvo.add(children);
+                }
+                generalBillVO_4A.setParentvo(parentvo);
+                generalBillVO_4A.setChildrenvo(childrenvo);
+                String dataJson = JSONUtil.toJsonStr(generalBillVO_4A);
+                mapStr = "{\"GeneralBillVO_4A\":[" + dataJson + "]}";
+
+                //推送
+                response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("otherinqz"), mapStr);
+                System.out.println(response);
+                boolean isSuccess = false;
+                String vbillcode="";
+                if (response != null && !"".equals(response)) {
+                    ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class);
+                    if ("success".equals(reusltStrDto.getStatus())) {
+                        isSuccess = true;
+                        String data = reusltStrDto.getData();
+                        GeneralBillVO_4ADto resGeneralBillVO = resultDataHandle(data);
+                        System.out.println(resGeneralBillVO);
+                        vbillcode = resGeneralBillVO.getParentvo().getVbillcode();
+                    }
+                }
+                if (!isSuccess) {
+                    Assert.state(false, "推送U8C--> 丽知：OFS调整入库--->U8C其它入库 失败 接口返回结果：{} 接口入参:{}", response, mapStr);
+                }
+
+                //成功
+                IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+                integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
+                integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
+                integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
+                integrationTaskLivingDetailsEntity.setRootAppBill(vbillcode);//u8c调拨订单号
+                integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+                saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);
+
+            }catch (Exception e){
+                e.printStackTrace();
+                logger.error("推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + e);
+
+                ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class);
+
+                String ErrMessage ="推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因："+ reusltStrDto.getErrormsg();
+                //失败
+                IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
+                integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
+                integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
+                integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+                integrationTaskLivingDetailsEntity.setBusinessDate(format);
+                integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
+                integrationTaskLivingDetailsEntity.setRootAppBill(null);//u8c调拨订单号
+                integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+                saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);
+            }
+        }
+    }
+
 
     public List<StockinOrderSearchResponse.StockinOrder> queryOfsStockinOrder(QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO) throws Exception {
         InterfaceParamDto interfaceParamDto = new InterfaceParamDto();
@@ -139,17 +363,34 @@ public class AdjustInPluginInitializer extends PluginBaseEntity {
         interfaceParamDto.setData(JSON.toJSONString(queryOfsStockinOrderRequestVO));
         StockinOrderSearchResponse stockinOrderSearchResponse = (StockinOrderSearchResponse) ofsUnifiedService.unified(interfaceParamDto);
         System.out.println(stockinOrderSearchResponse);
-        if(stockinOrderSearchResponse.getData()==null||stockinOrderSearchResponse.getData().size()==0){
+        if (stockinOrderSearchResponse.getData() == null || stockinOrderSearchResponse.getData().size() == 0) {
             return null;
         }
         //过滤ADJUST调整
-        List<StockinOrderSearchResponse.StockinOrder> adjustList=new ArrayList<>();
+        List<StockinOrderSearchResponse.StockinOrder> adjustList = new ArrayList<>();
         for (StockinOrderSearchResponse.StockinOrder datum : stockinOrderSearchResponse.getData()) {
             StockinOrderSearchResponse.StockinOrder.StockinH header = datum.getHeader();
-            if("ADJUST".equals(header.getInternalInstructionType())){
+            if ("ADJUST".equals(header.getInternalInstructionType())) {
                 adjustList.add(datum);
             }
         }
         return adjustList;
     }
+
+
+    private GeneralBillVO_4ADto resultDataHandle(String resultData) {
+        try {
+            if (resultData != null && !"".equals(resultData)) {
+                if (resultData.contains("[")) {
+                    resultData = resultData.substring(1, resultData.length() - 1);
+                }
+                return JSON.parseObject(resultData, GeneralBillVO_4ADto.class);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("解析返回参数失败的错误", e);
+            //如果解析失败，记录原因，但是不能影响结果的记录
+        }
+        return null;
+    }
 }

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

@@ -4,9 +4,13 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.lets.ofsvo.QueryOfsGoodsRequestVO;
+import com.hzya.frame.plugin.lets.ofsvo.QueryOfsTransferOrderRequestVO;
 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.ttxofs.dto.InterfaceParamDto;
+import com.hzya.frame.ttxofs.service.OfsUnifiedService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,6 +70,9 @@ public class GoodsPluginInitializer extends PluginBaseEntity {
     private PushDataByU8cUtil pushDataByU8cUtil;
     @Autowired
     private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil;
+
+    @Autowired
+    private OfsUnifiedService ofsUnifiedService;
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
         return null;
@@ -93,6 +100,9 @@ public class GoodsPluginInitializer extends PluginBaseEntity {
      */
     public void start(String goodsName) {
         try {
+            QueryOfsGoodsRequestVO queryOfsGoodsRequestVO = new QueryOfsGoodsRequestVO();
+
+
         } catch (Exception e) {
             logger.error("丽知：丽知：OFS货品档案--->U8C货品档案,start(String goodsName)方法报错：", e);
         }
@@ -113,6 +123,17 @@ public class GoodsPluginInitializer extends PluginBaseEntity {
         }
     }
 
+    /**
+     * 查询OFS SKU档案
+     */
+    public void queryOfsGoods(QueryOfsGoodsRequestVO queryOfsGoodsRequestVO) throws Exception {
+        InterfaceParamDto interfaceParamDto = new InterfaceParamDto();
+        interfaceParamDto.setApi("ofs.sku.search");
+        queryOfsGoodsRequestVO.setClientCode("LETS");
+        ofsUnifiedService.unified(interfaceParamDto);
+
+    }
+
 
 
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java

@@ -455,7 +455,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                 Date dbill = DateUtil.parse(shipAt);
                 businessFormat = DateUtil.format(dbill, "yyyy-MM-dd");
             } catch (Exception e) {
-                e.printStackTrace();
+//                e.printStackTrace();
                 logger.error("业务日期转换失败", e);
             }
             return businessFormat;
@@ -593,6 +593,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
             for (int i = 0; i < detailsDtos.size(); i++) {
                 com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto detailsDto = detailsDtos.get(i);
                 TocofsSaleoutDetailedEntity tocofsSaleoutDetailedEntity = new TocofsSaleoutDetailedEntity();
+                tocofsSaleoutDetailedEntity.setBusinessType("TOC_ORDER");
 //                BeanUtils.copyProperties(detailsDto, tocofsSaleoutDetailedEntity);
                 BeanUtil.copyPropertiesV2(detailsDto, tocofsSaleoutDetailedEntity);
                 tocofsSaleoutDetailedEntityArrayList.add(tocofsSaleoutDetailedEntity);
@@ -676,7 +677,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
     private BdBusitypeEntity u8cOperationFlow() throws Exception {
         //查询业务流程
         //2024年8月6日 11:33:07 具体的业务流程名称，还需要实施提供
-        String processName = "TOC销售业务流程";
+        String processName = "TOC销售";
         BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName);
         Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName);
         return bdBusitypeEntity;
@@ -837,6 +838,4 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
         }
         return null;
     }
-
-
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java

@@ -365,6 +365,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                             BigDecimal noriginalcursummny = null;//价税合计
                             BigDecimal noriginalcurtaxmny = null;//税额=价税合计-无税金额
                             try {
+                                //TODO 这个金额取错了，需要取售后订单的退款金额
                                 noriginalcurtaxprice = goodsRertunSonDetailsDto.getGroupTotalPayAmount().divide(goodsRertunSonDetailsDto.getGroupShipQty(), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
                                 noriginalcurprice = noriginalcurtaxprice.divide(new BigDecimal(1).add(new BigDecimal(tax)), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
                                 noriginalcurmny = noriginalcurprice.multiply(goodsRertunSonDetailsDto.getGroupShipQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -586,6 +587,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                 ReturnGoodSearchDetailsDto returnGoodSearchDetailsDto = headerDetailsDtoList2.get(i);
 
                 TocofsReturngoodsDetailedEntity tocofsReturngoodsDetailedEntity = new TocofsReturngoodsDetailedEntity();
+                tocofsReturngoodsDetailedEntity.setBusinessType("TOC_RETURN");
                 BeanUtil.copyPropertiesV2(returnGoodSearchDetailsDto, tocofsReturngoodsDetailedEntity);
                 tocofsSaleoutDetailedEntityArrayList.add(tocofsReturngoodsDetailedEntity);
             }
@@ -670,7 +672,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
     private BdBusitypeEntity u8cOperationFlow() throws Exception {
         //查询业务流程
         //2024年8月6日 11:33:07 具体的业务流程名称，还需要实施提供
-        String processName = "TOC销售业务流程";
+        String processName = "TOC销售";
         BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName);
         Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName);
         return bdBusitypeEntity;

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferPluginInitializer.java

@@ -275,7 +275,6 @@ public class TransferPluginInitializer extends PluginBaseEntity {
                 parentvo.setCoutwhid(ofsHeader.getFacilityCode());
                 parentvo.setCoutwhid("01");
 
-
                 //cincbid 调入组织编码 对应OFS->目标库存地点公司
                 parentvo.setCincbid("SHXM");
 
@@ -326,7 +325,6 @@ public class TransferPluginInitializer extends PluginBaseEntity {
                     Assert.state(false, "推送U8C--> 丽知：OFS调拨订单--->U8C调拨订单(保存及签字) 失败 接口返回结果：{} 接口入参:{}", response, jsonStr);
                 }
 
-
                 //成功
                 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
                 integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
@@ -346,7 +344,7 @@ public class TransferPluginInitializer extends PluginBaseEntity {
 
                 //失败
                 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
-                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+                integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
                 integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
                 integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
                 integrationTaskLivingDetailsEntity.setNewPushDate(new Date());

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

@@ -1,23 +1,26 @@
 package com.hzya.frame.plugin.lets.u8cdto;
 
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * 库存其他入库单
  * @author zyd
  */
+@Data
 public class GeneralBillVO_4ADto {
     /**
      * 表头
      */
     private Parentvo parentvo;
-
     /**
      * 表体
      */
     private List<Childrenvo> childrenvo;
-
+    @Data
     public static class Parentvo{
+        private String vbillcode;//
         private String cwarehouseid;//
         private String pk_calbody;//库存组织
         private String pk_corp;//
@@ -28,87 +31,11 @@ public class GeneralBillVO_4ADto {
         private String dbilldate;//单据日期
         private String dauditdate;//签字日期
 
-        private String vuserdef20;//自定义项20---》存旺店通出库单号：20240418习老师
+        private String vuserdef19;//自定义项19--->ofs调整单号
+        private String vuserdef20;//自定义项20
 
-        public String getVuserdef20() {
-            return vuserdef20;
-        }
-
-        public void setVuserdef20(String vuserdef20) {
-            this.vuserdef20 = vuserdef20;
-        }
-
-        public String getDauditdate() {
-            return dauditdate;
-        }
-
-        public void setDauditdate(String dauditdate) {
-            this.dauditdate = dauditdate;
-        }
-
-        public String getDbilldate() {
-            return dbilldate;
-        }
-
-        public void setDbilldate(String dbilldate) {
-            this.dbilldate = dbilldate;
-        }
-
-        public String getCoperatoridnow() {
-            return coperatoridnow;
-        }
-
-        public void setCoperatoridnow(String coperatoridnow) {
-            this.coperatoridnow = coperatoridnow;
-        }
-
-        public String getPk_corp() {
-            return pk_corp;
-        }
-
-        public void setPk_corp(String pk_corp) {
-            this.pk_corp = pk_corp;
-        }
-
-        public String getCwarehouseid() {
-            return cwarehouseid;
-        }
-
-        public void setCwarehouseid(String cwarehouseid) {
-            this.cwarehouseid = cwarehouseid;
-        }
-
-        public String getPk_calbody() {
-            return pk_calbody;
-        }
-
-        public void setPk_calbody(String pk_calbody) {
-            this.pk_calbody = pk_calbody;
-        }
-
-        public String getVnote() {
-            return vnote;
-        }
-
-        public void setVnote(String vnote) {
-            this.vnote = vnote;
-        }
-
-        public String getCoperatorid() {
-            return coperatorid;
-        }
-        public void setCoperatorid(String coperatorid) {
-            this.coperatorid = coperatorid;
-        }
-
-        public String getCdispatcherid() {
-            return cdispatcherid;
-        }
-
-        public void setCdispatcherid(String cdispatcherid) {
-            this.cdispatcherid = cdispatcherid;
-        }
     }
+    @Data
     public static class Childrenvo{
         private String cinventoryid;//存货id
         private String castunitid;
@@ -138,141 +65,7 @@ public class GeneralBillVO_4ADto {
          */
         private String csourcebillbid;
 
-        public String getDbizdate() {
-            return dbizdate;
-        }
-
-        public void setDbizdate(String dbizdate) {
-            this.dbizdate = dbizdate;
-        }
-
-        public String getNshouldinnum() {
-            return nshouldinnum;
-        }
-
-        public void setNshouldinnum(String nshouldinnum) {
-            this.nshouldinnum = nshouldinnum;
-        }
-
-        public String getVsourcerowno() {
-            return vsourcerowno;
-        }
-
-        public void setVsourcerowno(String vsourcerowno) {
-            this.vsourcerowno = vsourcerowno;
-        }
-
-        public String getCsourcebillhid() {
-            return csourcebillhid;
-        }
-
-        public void setCsourcebillhid(String csourcebillhid) {
-            this.csourcebillhid = csourcebillhid;
-        }
-
-        public String getCsourcebillbid() {
-            return csourcebillbid;
-        }
-
-        public void setCsourcebillbid(String csourcebillbid) {
-            this.csourcebillbid = csourcebillbid;
-        }
-
-        public String getVsourcebillcode() {
-            return vsourcebillcode;
-        }
-
-        public void setVsourcebillcode(String vsourcebillcode) {
-            this.vsourcebillcode = vsourcebillcode;
-        }
-
-        public String getVbatchcode() {
-            return vbatchcode;
-        }
-
-        public void setVbatchcode(String vbatchcode) {
-            this.vbatchcode = vbatchcode;
-        }
-
-        public String getCinventoryid() {
-            return cinventoryid;
-        }
-
-        public void setCinventoryid(String cinventoryid) {
-            this.cinventoryid = cinventoryid;
-        }
-
-        public String getCastunitid() {
-            return castunitid;
-        }
-
-        public void setCastunitid(String castunitid) {
-            this.castunitid = castunitid;
-        }
-
-        public String getNinnum() {
-            return ninnum;
-        }
-
-        public void setNinnum(String ninnum) {
-            this.ninnum = ninnum;
-        }
-
-        public String getNprice() {
-            return nprice;
-        }
-
-        public void setNprice(String nprice) {
-            this.nprice = nprice;
-        }
-
-        public String getVnotebody() {
-            return vnotebody;
-        }
-
-        public void setVnotebody(String vnotebody) {
-            this.vnotebody = vnotebody;
-        }
-
-        public String getBonroadflag() {
-            return bonroadflag;
-        }
-
-        public void setBonroadflag(String bonroadflag) {
-            this.bonroadflag = bonroadflag;
-        }
-
-        public String getFlargess() {
-            return flargess;
-        }
-
-        public void setFlargess(String flargess) {
-            this.flargess = flargess;
-        }
-
-        public String getNshouldoutnum() {
-            return nshouldoutnum;
-        }
-
-        public void setNshouldoutnum(String nshouldoutnum) {
-            this.nshouldoutnum = nshouldoutnum;
-        }
     }
 
-    public Parentvo getParentvo() {
-        return parentvo;
-    }
-
-    public void setParentvo(Parentvo parentvo) {
-        this.parentvo = parentvo;
-    }
-
-    public List<Childrenvo> getChildrenvo() {
-        return childrenvo;
-    }
-
-    public void setChildrenvo(List<Childrenvo> childrenvo) {
-        this.childrenvo = childrenvo;
-    }
 
 }

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

@@ -1,11 +1,14 @@
 package com.hzya.frame.plugin.lets.u8cdto;
 
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * 库存其他出库单
  * @author zyd
  */
+@Data
 public class GeneralBillVO_4IDto {
     /**
      * 表头
@@ -16,7 +19,7 @@ public class GeneralBillVO_4IDto {
      * 表体
      */
     private List<Childrenvo> childrenvo;
-
+    @Data
     public static class Parentvo{
         /**
          * 自动拣货标识
@@ -33,103 +36,10 @@ public class GeneralBillVO_4IDto {
         private String vnote;
         private String dauditdate;//签字日期
 
-        private String vuserdef20;//自定义项20---》存旺店通出库单号：20240418习老师
+        private String vuserdef19;//自定义项19--->ofs调整单号
-
+        private String vuserdef20;//自定义项20
-        public String getVuserdef20() {
-            return vuserdef20;
-        }
-
-        public void setVuserdef20(String vuserdef20) {
-            this.vuserdef20 = vuserdef20;
-        }
-
-        public String getDauditdate() {
-            return dauditdate;
-        }
-
-        public void setDauditdate(String dauditdate) {
-            this.dauditdate = dauditdate;
-        }
-
-        public String getIsautopick() {
-            return isautopick;
-        }
-
-        public void setIsautopick(String isautopick) {
-            this.isautopick = isautopick;
-        }
-
-        public String getVbillcode() {
-            return vbillcode;
-        }
-
-        public void setVbillcode(String vbillcode) {
-            this.vbillcode = vbillcode;
-        }
-
-        public String getPk_corp() {
-            return pk_corp;
-        }
-
-        public void setPk_corp(String pk_corp) {
-            this.pk_corp = pk_corp;
-        }
-
-        public String getClastmodiid() {
-            return clastmodiid;
-        }
-
-        public void setClastmodiid(String clastmodiid) {
-            this.clastmodiid = clastmodiid;
-        }
-
-        public String getDbilldate() {
-            return dbilldate;
-        }
-
-        public void setDbilldate(String dbilldate) {
-            this.dbilldate = dbilldate;
-        }
-
-        public String getCwarehouseid() {
-            return cwarehouseid;
-        }
-
-        public void setCwarehouseid(String cwarehouseid) {
-            this.cwarehouseid = cwarehouseid;
-        }
-
-        public String getPk_calbody() {
-            return pk_calbody;
-        }
-
-        public void setPk_calbody(String pk_calbody) {
-            this.pk_calbody = pk_calbody;
-        }
-
-        public String getVnote() {
-            return vnote;
-        }
-
-        public void setVnote(String vnote) {
-            this.vnote = vnote;
-        }
-
-        public String getCoperatorid() {
-            return coperatorid;
-        }
-        public void setCoperatorid(String coperatorid) {
-            this.coperatorid = coperatorid;
-        }
-
-        public String getCdispatcherid() {
-            return cdispatcherid;
-        }
-
-        public void setCdispatcherid(String cdispatcherid) {
-            this.cdispatcherid = cdispatcherid;
-        }
     }
+    @Data
     public static class Childrenvo{
         private String cinventoryid;
         private String castunitid;
@@ -159,126 +69,6 @@ public class GeneralBillVO_4IDto {
          * 来源单据行id
          */
         private String csourcebillbid;
-
-        public String getDbizdate() {
-            return dbizdate;
-        }
-
-        public void setDbizdate(String dbizdate) {
-            this.dbizdate = dbizdate;
-        }
-
-        public String getCsourcebillbid() {
-            return csourcebillbid;
-        }
-
-        public void setCsourcebillbid(String csourcebillbid) {
-            this.csourcebillbid = csourcebillbid;
-        }
-
-        public String getCsourcebillhid() {
-            return csourcebillhid;
-        }
-
-        public void setCsourcebillhid(String csourcebillhid) {
-            this.csourcebillhid = csourcebillhid;
-        }
-
-        public String getVsourcerowno() {
-            return vsourcerowno;
-        }
-
-        public void setVsourcerowno(String vsourcerowno) {
-            this.vsourcerowno = vsourcerowno;
-        }
-
-        public String getVsourcebillcode() {
-            return vsourcebillcode;
-        }
-
-        public void setVsourcebillcode(String vsourcebillcode) {
-            this.vsourcebillcode = vsourcebillcode;
-        }
-
-        public String getCinventoryid() {
-            return cinventoryid;
-        }
-
-        public void setCinventoryid(String cinventoryid) {
-            this.cinventoryid = cinventoryid;
-        }
-
-        public String getCastunitid() {
-            return castunitid;
-        }
-
-        public void setCastunitid(String castunitid) {
-            this.castunitid = castunitid;
-        }
-
-        public String getNoutnum() {
-            return noutnum;
-        }
-
-        public void setNoutnum(String noutnum) {
-            this.noutnum = noutnum;
-        }
-
-        public String getNprice() {
-            return nprice;
-        }
-
-        public void setNprice(String nprice) {
-            this.nprice = nprice;
-        }
-
-        public String getVnotebody() {
-            return vnotebody;
-        }
-
-        public void setVnotebody(String vnotebody) {
-            this.vnotebody = vnotebody;
-        }
-
-        public String getBonroadflag() {
-            return bonroadflag;
-        }
-
-        public void setBonroadflag(String bonroadflag) {
-            this.bonroadflag = bonroadflag;
-        }
-
-        public String getFlargess() {
-            return flargess;
-        }
-
-        public void setFlargess(String flargess) {
-            this.flargess = flargess;
-        }
-
-        public String getNshouldoutnum() {
-            return nshouldoutnum;
-        }
-
-        public void setNshouldoutnum(String nshouldoutnum) {
-            this.nshouldoutnum = nshouldoutnum;
-        }
-    }
-
-    public Parentvo getParentvo() {
-        return parentvo;
-    }
-
-    public void setParentvo(Parentvo parentvo) {
-        this.parentvo = parentvo;
-    }
-
-    public List<Childrenvo> getChildrenvo() {
-        return childrenvo;
-    }
-
-    public void setChildrenvo(List<Childrenvo> childrenvo) {
-        this.childrenvo = childrenvo;
     }
 
 }

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

@@ -1,32 +1,11 @@
 package com.hzya.frame.plugin.lets.u8cdto;
 
-public class ReusltStrDto {
+import lombok.Data;
 
+@Data
+public class ReusltStrDto {
     private String status;
     private String data;
+    private String errormsg;
     private String taskNumber;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public String getTaskNumber() {
-        return taskNumber;
-    }
-
-    public void setTaskNumber(String taskNumber) {
-        this.taskNumber = taskNumber;
-    }
 }

buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-sowow-plugin.xml

@@ -17,7 +17,6 @@
     <!--调拨-->
     <bean name="transferPluginInitializer" class="com.hzya.frame.plugin.lets.plugin.transfer.TransferPluginInitializer"/>
     <bean name="transferInPluginInitializer" class="com.hzya.frame.plugin.lets.plugin.transfer.TransferInPluginInitializer"/>
-    <bean name="transferOutPluginInitializer" class="com.hzya.frame.plugin.lets.plugin.transfer.TransferOutPluginInitializer"/>
     <!--调整-->
     <bean name="adjustInPluginInitializer" class="com.hzya.frame.plugin.lets.plugin.adjust.AdjustInPluginInitializer"/>
     <bean name="adjustOutPluginInitializer" class="com.hzya.frame.plugin.lets.plugin.adjust.AdjustOutPluginInitializer"/>

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/BaseTest.java

@@ -23,6 +23,6 @@ public class BaseTest {
 
     @Test
     public void t01(){
-        goodsAutoAllotPluginInitializer.start("0001A210000000000JOC");
+        goodsAutoAllotPluginInitializer.start("0001A210000000000U4C");
     }
 }

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java

@@ -1,6 +1,7 @@
 package com.hzya.frame.plugin.lets.plugin.transfer;
 
 import com.hzya.frame.WebappApplication;
+import com.hzya.frame.plugin.lets.plugin.adjust.AdjustInPluginInitializer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,8 @@ public class TransferTest {
 
     @Autowired
     private TransferInPluginInitializer transferInPluginInitializer;
+    @Autowired
+    private AdjustInPluginInitializer adjustInPluginInitializer;
 
     ////////////////////////////////////////////////////////////////////////////////////调拨订单
     @Test
@@ -29,6 +32,7 @@ public class TransferTest {
 
 
     ////////////////////////////////////////////////////////////////////////////////////调拨出库单
+
     ////////////////////////////////////////////////////////////////////////////////////调拨入库单
     @Test
     public void t20(){
@@ -40,4 +44,23 @@ public class TransferTest {
     }
 
 
+
+
+    ////////////////////////////////////////////////////////////////////////////////////调整入库单
+    @Test
+    public void t30(){
+        adjustInPluginInitializer.start();
+    }
+    @Test
+    public void t31(){
+        adjustInPluginInitializer.start("LETS-AH2024081300000003");
+    }
+    @Test
+    public void t32(){
+        adjustInPluginInitializer.start("2024-08-14","2024-08-14");
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////调整出库单
+
+
 }

service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java

@@ -27,5 +27,8 @@ public class ApiDtoCacheMap {
         apiDtoCacheMap.put("ofs.shipment.search", new SaleOutReturnMessageDto());
         apiDtoCacheMap.put("ofs.receipt.search", new StockinOrderSearchResponse());//入库单查询
         apiDtoCacheMap.put("ofs.transferOrder.search", new OFSTranseferOrderSearchResponse());//调拨订单
+
+
+        apiDtoCacheMap.put("ofs.transferOrder.search", new OFSTranseferOrderSearchResponse());//SKU查询
     }
 }

service/src/main/java/com/hzya/frame/ttxofs/service/OfsUnifiedService.java

@@ -15,7 +15,7 @@ import com.hzya.frame.ttxofs.dto.InterfaceParamDto;
  */
 public interface OfsUnifiedService {
     /**
-     * OFS出库单查询
+     * OFS接口入库
      *
      * @author liuyang
      */