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

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

@@ -77,4 +77,7 @@ public class MetaHanaDeliverSign extends BaseEntity
     @Excel(name = "异常出库订单的差异数量")
     private String abnormalDifferenceQty;
 
+    /**异常出库订单客户签收日期**/
+    private String abnormalZdateDate;
+
 }

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

@@ -105,6 +105,8 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
                     deliverSign.setAbnormalDifferenceQty(abnormalSign.getDifferenceQty());
                     //实收数量
                     deliverSign.setAbnormalActualQty(abnormalSign.getActualQty());
+                    //客户签收日期
+                    deliverSign.setAbnormalZdateDate(abnormalSign.getZdateDate());
                     metaHanaDeliverSignMapper.updateMetaHanaDeliverSign(deliverSign);
                 }
             });

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

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
     </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 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_order_Item, abnormal_actual_qty, abnormal_difference_qty,abnormal_zdate_date from meta_hana_deliver_sign
     </sql>
 
     <select id="selectMetaHanaDeliverSignList" parameterType="MetaHanaDeliverSign" resultMap="MetaHanaDeliverSignResult">
@@ -44,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+
         </where>
     </select>
 
@@ -70,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </trim>
         where deliver_number = #{deliverNumber} and deliver_Item =#{deliverItem}
     </update>