Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml

@@ -27,5 +27,53 @@
         <result property="updateBy" column="update_by"/>
     </resultMap>
 
+    <resultMap type="com.klp.domain.vo.WmsCoilBindInfoVo" id="WmsCoilBindInfoResult">
+        <result property="coilId" column="coil_id"/>
+        <result property="detailId" column="detail_id"/>
+        <result property="waybillId" column="waybill_id"/>
+        <result property="waybillNo" column="waybill_no"/>
+        <result property="waybillName" column="waybill_name"/>
+        <result property="planId" column="plan_id"/>
+        <result property="planName" column="plan_name"/>
+        <result property="planDate" column="plan_date"/>
+    </resultMap>
+
+    <select id="selectBindInfoByCoilIds" resultMap="WmsCoilBindInfoResult">
+        SELECT
+            d.coil_id,
+            d.detail_id,
+            w.waybill_id,
+            w.waybill_no,
+            w.waybill_name,
+            p.plan_id,
+            p.plan_name,
+            p.plan_date
+        FROM wms_delivery_waybill_detail d
+        INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
+        INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
+        WHERE d.del_flag = 0
+          AND d.coil_id IN
+        <foreach collection="coilIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="selectBindInfoByCoilId" resultMap="WmsCoilBindInfoResult">
+        SELECT
+            d.coil_id,
+            d.detail_id,
+            w.waybill_id,
+            w.waybill_no,
+            w.waybill_name,
+            p.plan_id,
+            p.plan_name,
+            p.plan_date
+        FROM wms_delivery_waybill_detail d
+        INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
+        INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
+        WHERE d.del_flag = 0
+          AND d.coil_id = #{coilId}
+        LIMIT 1
+    </select>
 
 </mapper>

klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml

@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.temper_grade,
             mc.exclusive_status,
             su.nick_name AS saleName,
+            w.warehouse_name AS warehouseName,
             aw.actual_warehouse_name AS actualWarehouseName,
             CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
                  WHEN mc.item_type = 'product' THEN p.specification