Merge remote-tracking branch 'origin/电子签收hana数据' into uat

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -216,8 +216,8 @@ public class HanaOrderComponent {
                 "\t LFIMG_CY,\n" +
                 "\t ZDATE_KH,\n" +
                 "\t ZTIME_KH,\n" +
-                "\t ZRETURTMSG,\n" +
-                "\t ZPOSNR_YC FROM  ERP.ZSDT056 where ERDAT_SO between ADD_MONTHS(CURRENT_DATE, -3) AND CURRENT_DATE");
+                "\t ZVBELN_YCHH,\n" +
+                "\t ZSTATUS_HH FROM  ERP.ZSDT056 where ERDAT_SO between ADD_MONTHS(CURRENT_DATE, -3) AND CURRENT_DATE");
 
         Long startTime = System.currentTimeMillis();
         ResultSet rs = pstmt.executeQuery();
@@ -368,8 +368,8 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("LFIMG_CY")
                                 +"$$"+ result.getString("ZDATE_KH")
                                 +"$$"+ result.getString("ZTIME_KH")
-                                +"$$"+ result.getString("ZRETURTMSG")
-                                +"$$"+ result.getString("ZPOSNR_YC")
+                                +"$$"+ result.getString("ZVBELN_YCHH")
+                                +"$$"+ result.getString("ZSTATUS_HH")
                                 + "\r\n");
 
 
@@ -1194,10 +1194,7 @@ public class HanaOrderComponent {
                 }
             }
         }
-        /**
-         *电子单签收数据处理有补货订单的数据，将补货订单的数据实收数量和差异数量放到主单里；方便要货时进行简单计算和判断处理
-         */
-        metaHanaDeliverSignService.handleDeliverSignAbnormal();
+
     }
 
 //订单

suishenbang-system/src/main/java/com/dgtly/system/domain/MetaHanaDeliverSign.java

@@ -65,19 +65,10 @@ public class MetaHanaDeliverSign extends BaseEntity
     @Excel(name = "异常处理订单")
     private String abnormalOrder;
 
-    /** 异常处理订单行项目 */
-    @Excel(name = "异常处理订单行项目")
-    private String abnormalOrderItem;
+    /** 异常处理订单签收状态 */
+    @Excel(name = "异常处理订单签收状态")
+    private String abnormalStatus;
 
-    /** 异常处理的订单实收数量 */
-    @Excel(name = "异常处理的订单实收数量")
-    private String abnormalActualQty;
 
-    /** 异常出库订单的差异数量 */
-    @Excel(name = "异常出库订单的差异数量")
-    private String abnormalDifferenceQty;
-
-    /**异常出库订单客户签收日期**/
-    private String abnormalZdateDate;
 
 }

suishenbang-system/src/main/java/com/dgtly/system/service/IMetaHanaDeliverSignService.java

@@ -53,12 +53,5 @@ public interface IMetaHanaDeliverSignService
      */
     public int deleteMetaHanaDeliverSignById(String deliverNumber);
 
-    /**
-     * @description: 处理有补货订单的签收数据
-     * @param: []
-     * @return: java.util.List<com.dgtly.system.domain.MetaHanaDeliverSign>
-     * @author: njs
-     * @date: 2025/1/3 15:52
-     */
-   public void handleDeliverSignAbnormal();
+
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java

@@ -82,34 +82,5 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
         return metaHanaDeliverSignMapper.deleteMetaHanaDeliverSignById(deliverNumber);
     }
 
-    /**
-     * @description: 查询有补货订单的签收数据
-     * @param: []
-     * @return: java.util.List<com.dgtly.system.domain.MetaHanaDeliverSign>
-     * @author: njs
-     * @date: 2025/1/3 15:52
-     */
-    @Override
-    public void handleDeliverSignAbnormal() {
-        /**
-         *电子单签收数据处理有补货订单的数据，将补货订单的数据实收数量和差异数量放到主单里；方便要货时进行简单计算和判断处理
-         */
-        //查询有补货订单的数据
-        List<MetaHanaDeliverSign> deliverSignList = metaHanaDeliverSignMapper.selectMetaHanaDeliverSignListHavingAbnormal();
-        if(deliverSignList !=null && deliverSignList.size()>0){
-            deliverSignList.forEach(deliverSign->{
-                //查询补货订单的实收数量和差异数量
-                MetaHanaDeliverSign abnormalSign = metaHanaDeliverSignMapper.selectAbnormalSignByabnormalOrderAndItem(deliverSign.getAbnormalOrder(),deliverSign.getAbnormalOrderItem());
-                if(abnormalSign !=null){
-                    //差异数量
-                    deliverSign.setAbnormalDifferenceQty(abnormalSign.getDifferenceQty());
-                    //实收数量
-                    deliverSign.setAbnormalActualQty(abnormalSign.getActualQty());
-                    //客户签收日期
-                    deliverSign.setAbnormalZdateDate(abnormalSign.getZdateDate());
-                    metaHanaDeliverSignMapper.updateMetaHanaDeliverSign(deliverSign);
-                }
-            });
-        }
-    }
+
 }

suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverSignMapper.xml

@@ -17,14 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zdateDate"    column="zdate_date"    />
         <result property="zdateTime"    column="zdate_time"    />
         <result property="abnormalOrder"    column="abnormal_order"    />
-        <result property="abnormalOrderItem"    column="abnormal_order_Item"    />
-        <result property="abnormalActualQty"    column="abnormal_actual_qty"    />
-        <result property="abnormalDifferenceQty"    column="abnormal_difference_qty"    />
-        <result property="abnormalZdateDate"    column="abnormal_zdate_date"    />
+        <result property="abnormalStatus"    column="abnormal_status"    />
     </resultMap>
 
     <sql id="selectMetaHanaDeliverSignVo">
-        select deliver_number, deliver_Item,matnr_code, order_number, order_Item, order_create_time, deliver_qty, actual_qty, difference_qty, zdate_date, zdate_time, abnormal_order, abnormal_order_Item, abnormal_actual_qty, abnormal_difference_qty,abnormal_zdate_date from meta_hana_deliver_sign
+        select deliver_number, deliver_Item,matnr_code, order_number, order_Item, order_create_time, deliver_qty, actual_qty, difference_qty, zdate_date, zdate_time, abnormal_order, abnormal_status from meta_hana_deliver_sign
     </sql>
 
     <select id="selectMetaHanaDeliverSignList" parameterType="MetaHanaDeliverSign" resultMap="MetaHanaDeliverSignResult">
@@ -42,10 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zdateDate != null  and zdateDate != ''"> and zdate_date = #{zdateDate}</if>
             <if test="zdateTime != null  and zdateTime != ''"> and zdate_time = #{zdateTime}</if>
             <if test="abnormalOrder != null  and abnormalOrder != ''"> and abnormal_order = #{abnormalOrder}</if>
-            <if test="abnormalOrderItem != null  and abnormalOrderItem != ''"> and abnormal_order_Item = #{abnormalOrderItem}</if>
-            <if test="abnormalActualQty != null  and abnormalActualQty != ''"> and abnormal_actual_qty = #{abnormalActualQty}</if>
-            <if test="abnormalDifferenceQty != null  and abnormalDifferenceQty != ''"> and abnormal_difference_qty = #{abnormalDifferenceQty}</if>
-            <if test="abnormalZdateDate != null  and abnormalZdateDate != ''"> and abnormal_zdate_date = #{abnormalZdateDate}</if>
+            <if test="abnormalStatus != null  and abnormalStatus != ''"> and abnormal_status = #{abnormalStatus}</if>
 
         </where>
     </select>
@@ -70,10 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zdateDate != null  and zdateDate != ''">zdate_date = #{zdateDate},</if>
             <if test="zdateTime != null  and zdateTime != ''">zdate_time = #{zdateTime},</if>
             <if test="abnormalOrder != null  and abnormalOrder != ''">abnormal_order = #{abnormalOrder},</if>
-            <if test="abnormalOrderItem != null  and abnormalOrderItem != ''">abnormal_order_Item = #{abnormalOrderItem},</if>
-            <if test="abnormalActualQty != null  and abnormalActualQty != ''">abnormal_actual_qty = #{abnormalActualQty},</if>
-            <if test="abnormalDifferenceQty != null  and abnormalDifferenceQty != ''">abnormal_difference_qty = #{abnormalDifferenceQty},</if>
-            <if test="abnormalZdateDate != null  and abnormalZdateDate != ''"> abnormal_zdate_date = #{abnormalZdateDate},</if>
+            <if test="abnormalStatus != null  and abnormalStatus != ''">abnormal_status = #{abnormalStatus},</if>
+
         </trim>
         where deliver_number = #{deliverNumber} and deliver_Item =#{deliverItem}
     </update>
@@ -98,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMetaHanaDeliverSignVo"/>
          <where>
             <if test="abnormalOrder != null  and abnormalOrder != ''"> and order_number = #{abnormalOrder}</if>
-             <if test="abnormalOrderItem != null  and abnormalOrderItem != ''"> and order_Item = #{abnormalOrderItem}</if>
          </where>
          limit 1
     </select>