Browse Source

交货单行项目号

njs 3 months ago
parent
commit
cee686aa04

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

@@ -21,6 +21,10 @@ public class MetaHanaDeliverSign extends BaseEntity
     @Excel(name = "交货单号")
     private String deliverNumber;
 
+    /** 交货单行项目号 */
+    @Excel(name = "交货单行项目号")
+    private String deliverItem;
+
     /** 物料号 */
     @Excel(name = "物料号")
     private String matnrCode;

+ 1 - 7
suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaDeliverSignMapper.java

@@ -30,13 +30,7 @@ public interface MetaHanaDeliverSignMapper
     public List<MetaHanaDeliverSign> selectMetaHanaDeliverSignList(MetaHanaDeliverSign metaHanaDeliverSign);
 
 
-    /**
-     * 新增电子单签收状态数量
-     *
-     * @param metaHanaDeliverSign 电子单签收状态数量
-     * @return 结果
-     */
-    public int insertMetaHanaDeliverSign(MetaHanaDeliverSign metaHanaDeliverSign);
+
 
     /**
      * 修改电子单签收状态数量

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

@@ -27,13 +27,7 @@ public interface IMetaHanaDeliverSignService
      */
     public List<MetaHanaDeliverSign> selectMetaHanaDeliverSignList(MetaHanaDeliverSign metaHanaDeliverSign);
 
-    /**
-     * 新增电子单签收状态数量
-     *
-     * @param metaHanaDeliverSign 电子单签收状态数量
-     * @return 结果
-     */
-    public int insertMetaHanaDeliverSign(MetaHanaDeliverSign metaHanaDeliverSign);
+
 
     /**
      * 修改电子单签收状态数量

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

@@ -44,17 +44,7 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
         return metaHanaDeliverSignMapper.selectMetaHanaDeliverSignList(metaHanaDeliverSign);
     }
 
-    /**
-     * 新增电子单签收状态数量
-     *
-     * @param metaHanaDeliverSign 电子单签收状态数量
-     * @return 结果
-     */
-    @Override
-    public int insertMetaHanaDeliverSign(MetaHanaDeliverSign metaHanaDeliverSign)
-    {
-        return metaHanaDeliverSignMapper.insertMetaHanaDeliverSign(metaHanaDeliverSign);
-    }
+
 
     /**
      * 修改电子单签收状态数量

+ 5 - 37
suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverSignMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="MetaHanaDeliverSign" id="MetaHanaDeliverSignResult">
         <result property="deliverNumber"    column="deliver_number"    />
+        <result property="deliverItem"    column="deliver_Item"    />
         <result property="matnrCode"    column="matnr_code"    />
         <result property="orderNumber"    column="order_number"    />
         <result property="orderItem"    column="order_Item"    />
@@ -22,13 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMetaHanaDeliverSignVo">
-        select deliver_number, 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 from meta_hana_deliver_sign
     </sql>
 
     <select id="selectMetaHanaDeliverSignList" parameterType="MetaHanaDeliverSign" resultMap="MetaHanaDeliverSignResult">
         <include refid="selectMetaHanaDeliverSignVo"/>
         <where>
             <if test="deliverNumber != null  and deliverNumber != ''"> and deliver_number = #{deliverNumber}</if>
+            <if test="deliverItem != null  and deliverItem != ''"> and deliver_Item = #{deliverItem}</if>
             <if test="matnrCode != null  and matnrCode != ''"> and matnr_code = #{matnrCode}</if>
             <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
             <if test="orderItem != null  and orderItem != ''"> and order_Item = #{orderItem}</if>
@@ -50,41 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where deliver_number = #{deliverNumber}
     </select>
 
-    <insert id="insertMetaHanaDeliverSign" parameterType="MetaHanaDeliverSign">
-        insert into meta_hana_deliver_sign
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deliverNumber != null  and deliverNumber != ''">deliver_number,</if>
-            <if test="matnrCode != null  and matnrCode != ''">matnr_code,</if>
-            <if test="orderNumber != null  and orderNumber != ''">order_number,</if>
-            <if test="orderItem != null  and orderItem != ''">order_Item,</if>
-            <if test="orderCreateTime != null  and orderCreateTime != ''">order_create_time,</if>
-            <if test="deliverQty != null  and deliverQty != ''">deliver_qty,</if>
-            <if test="actualQty != null  and actualQty != ''">actual_qty,</if>
-            <if test="differenceQty != null  and differenceQty != ''">difference_qty,</if>
-            <if test="zdateDate != null  and zdateDate != ''">zdate_date,</if>
-            <if test="zdateTime != null  and zdateTime != ''">zdate_time,</if>
-            <if test="abnormalOrder != null  and abnormalOrder != ''">abnormal_order,</if>
-            <if test="abnormalOrderItem != null  and abnormalOrderItem != ''">abnormal_order_Item,</if>
-            <if test="abnormalActualQty != null  and abnormalActualQty != ''">abnormal_actual_qty,</if>
-            <if test="abnormalDifferenceQty != null  and abnormalDifferenceQty != ''">abnormal_difference_qty,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deliverNumber != null  and deliverNumber != ''">#{deliverNumber},</if>
-            <if test="matnrCode != null  and matnrCode != ''">#{matnrCode},</if>
-            <if test="orderNumber != null  and orderNumber != ''">#{orderNumber},</if>
-            <if test="orderItem != null  and orderItem != ''">#{orderItem},</if>
-            <if test="orderCreateTime != null  and orderCreateTime != ''">#{orderCreateTime},</if>
-            <if test="deliverQty != null  and deliverQty != ''">#{deliverQty},</if>
-            <if test="actualQty != null  and actualQty != ''">#{actualQty},</if>
-            <if test="differenceQty != null  and differenceQty != ''">#{differenceQty},</if>
-            <if test="zdateDate != null  and zdateDate != ''">#{zdateDate},</if>
-            <if test="zdateTime != null  and zdateTime != ''">#{zdateTime},</if>
-            <if test="abnormalOrder != null  and abnormalOrder != ''">#{abnormalOrder},</if>
-            <if test="abnormalOrderItem != null  and abnormalOrderItem != ''">#{abnormalOrderItem},</if>
-            <if test="abnormalActualQty != null  and abnormalActualQty != ''">#{abnormalActualQty},</if>
-            <if test="abnormalDifferenceQty != null  and abnormalDifferenceQty != ''">#{abnormalDifferenceQty},</if>
-         </trim>
-    </insert>
+
 
     <update id="updateMetaHanaDeliverSign" parameterType="MetaHanaDeliverSign">
         update meta_hana_deliver_sign
@@ -103,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="abnormalActualQty != null  and abnormalActualQty != ''">abnormal_actual_qty = #{abnormalActualQty},</if>
             <if test="abnormalDifferenceQty != null  and abnormalDifferenceQty != ''">abnormal_difference_qty = #{abnormalDifferenceQty},</if>
         </trim>
-        where deliver_number = #{deliverNumber}
+        where deliver_number = #{deliverNumber} and deliver_Item =#{deliverItem}
     </update>
 
     <delete id="deleteMetaHanaDeliverSignById" parameterType="String">