From baa366a81ad9926000deb7d7bd9ad120e0b1b97c Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Tue, 13 Aug 2024 14:08:32 +0800
Subject: [PATCH] =?UTF-8?q?2.9.2=20MES:=20=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=9A=201=E3=80=81=E5=9C=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=8A=E5=A2=9E=E5=8A=A0loading=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E4=BA=8C=E6=AC=A1=E7=82=B9=E5=87=BB=202=E3=80=81?=
 =?UTF-8?q?=E5=9C=A8=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81=E6=97=B6=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E4=BC=98=E5=85=88=E8=AF=BB=E5=8F=96=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E8=A7=84=E6=A0=BC=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=84=E6=A0=BC=E5=8F=82=E6=95=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=86=8D=E8=AF=BB=E5=8F=96=E7=89=A9=E6=96=99=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=203=E3=80=81=E6=97=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=204=E3=80=81=E5=9C=A8=E9=87=87=E8=B4=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=97=B6=E6=A0=B9=E6=8D=AE=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=91=E5=AE=9A=E7=9A=84=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=92=8C=E5=B7=B2=E7=BB=8F=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E5=81=9A=E5=88=A4=E6=96=AD=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=EF=BC=9A=20=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E7=9A=84=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesBaseBarcodeInfoMapper.xml   | 19 ++++--
 .../mapper/mes/MesBaseMaterialInfoMapper.xml  |  5 +-
 .../mapper/mes/MesOrderBindMapper.xml         |  4 +-
 .../mapper/mes/MesPurchaseOrderMapper.xml     | 68 ++++++++++++++++---
 4 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
index dbc77d3..da71a92 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
@@ -17,6 +17,7 @@
         <result property="palletInfoCode" column="pallet_info_code"/>
         <result property="bindBarcode" column="bind_barcode"/>
         <result property="materialId" column="material_id"/>
+        <result property="barcodeSpec" column="barcode_spec"/>
         <result property="manufacturerId" column="manufacturer_id"/>
         <result property="amount" column="amount"/>
         <result property="productBarcode" column="product_barcode"/>
@@ -62,6 +63,7 @@
                bbi.pallet_info_code,
                bbi.bind_barcode,
                bbi.material_id,
+               bbi.barcode_spec,
                bmi.material_code,
                bmi.material_name,
                bmi.material_spec,
@@ -116,6 +118,8 @@
                 '%')</if>
             <if test="materialSpec != null and materialSpec != '' ">and replace(bmi.material_spec,' ','') like concat('%', #{materialSpec},
                 '%')</if>
+            <if test="barcodeSpec != null and barcodeSpec != '' ">and replace(bbi.barcode_spec,' ','') like concat('%', #{barcodeSpec},
+                '%')</if>
 
             <if test="manufacturerId != null ">and bbi.manufacturer_id = #{manufacturerId}</if>
             <if test="amount != null ">and bbi.amount = #{amount}</if>
@@ -123,14 +127,16 @@
                 '%')
             </if>
             <if test="printNumber != null ">and bbi.print_number = #{printNumber}</if>
-            <if test="poNo != null  and poNo != ''">and bbi.po_no = #{poNo}</if>
+            <if test="poNo != null  and poNo != ''">and bbi.po_no like concat('%', #{poNo},
+                '%')</if>
             <if test="productionDate != null ">and bbi.production_date = #{productionDate}</if>
             <if test="acceptedDate != null ">and bbi.accepted_date = #{acceptedDate}</if>
             <if test="lastOutstockDate != null ">and bbi.last_outstock_date = #{lastOutstockDate}</if>
             <if test="planCode != null  and planCode != ''">and bbi.plan_code = #{planCode}</if>
             <if test="planDetailCode != null  and planDetailCode != ''">and bbi.plan_detail_code = #{planDetailCode}</if>
             <if test="saleOrderId != null ">and bbi.sale_order_id = #{saleOrderId}</if>
-            <if test="saleorderCode != null  and saleorderCode != ''">and bbi.saleorder_code = #{saleorderCode}</if>
+            <if test="saleorderCode != null  and saleorderCode != ''">and bbi.saleorder_code like concat('%', #{saleorderCode},
+                '%')</if>
             <if test="projectNo != null  and projectNo != ''">and bbi.project_no = #{projectNo}</if>
             <if test="serialNumber != null  and serialNumber != ''">and bbi.serial_number = #{serialNumber}</if>
             <if test="bindStatus != null  and bindStatus != ''">and bbi.bind_status = #{bindStatus}</if>
@@ -145,8 +151,6 @@
                 (select 1 from mes_base_barcode_info mbbi where mbbi.plan_detail_code =#{planDetailCode}
                 and bbi.bind_barcode=mbbi.barcode_info)</if>
 
-
-
         </where>
         order by bbi.barcode_id desc
     </select>
@@ -171,6 +175,7 @@
             <if test="palletInfoCode != null">pallet_info_code,</if>
             <if test="bindBarcode != null">bind_barcode,</if>
             <if test="materialId != null">material_id,</if>
+            <if test="barcodeSpec != null and barcodeSpec != ''">barcode_spec,</if>
             <if test="manufacturerId != null">manufacturer_id,</if>
             <if test="amount != null">amount,</if>
             <if test="productBarcode != null">product_barcode,</if>
@@ -208,6 +213,7 @@
             <if test="palletInfoCode != null">#{palletInfoCode},</if>
             <if test="bindBarcode != null">#{bindBarcode},</if>
             <if test="materialId != null">#{materialId},</if>
+            <if test="barcodeSpec != null and barcodeSpec != ''">#{barcodeSpec},</if>
             <if test="manufacturerId != null">#{manufacturerId},</if>
             <if test="amount != null">#{amount},</if>
             <if test="productBarcode != null">#{productBarcode},</if>
@@ -357,6 +363,7 @@
                bbi.pallet_info_code,
                bbi.bind_barcode,
                bbi.material_id,
+               bbi.barcode_spec,
                bbi.manufacturer_id,
                bbi.product_barcode,
                bbi.amount,
@@ -390,9 +397,9 @@
 
 
     <insert id="batchMesBaseBarcodeInfo">
-        INSERT INTO mes_base_barcode_info (batch_flag,barcode_type,barcode_info,batch_code,material_id,manufacturer_id,amount,purchase_order_id,po_no,production_date,accepted_date,last_outstock_date,plan_code,plan_detail_code,safe_flag,sale_order_id,saleorder_code,project_no,serial_number,remark,bind_status,update_by,update_time) VALUES
+        INSERT INTO mes_base_barcode_info (batch_flag,barcode_type,barcode_info,batch_code,material_id,barcode_spec,manufacturer_id,amount,purchase_order_id,po_no,production_date,accepted_date,last_outstock_date,plan_code,plan_detail_code,safe_flag,sale_order_id,saleorder_code,project_no,serial_number,remark,bind_status,update_by,update_time) VALUES
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.batchFlag}, #{item.barcodeType}, #{item.barcodeInfo}, #{item.batchCode}, #{item.materialId}, #{item.manufacturerId}, #{item.amount}, #{item.purchaseOrderId}, #{item.poNo}, #{item.productionDate}, #{item.acceptedDate}, #{item.lastOutstockDate}, #{item.planCode},#{item.planDetailCode}, #{item.safeFlag},#{item.saleOrderId}, #{item.saleorderCode},#{item.projectNo}, #{item.serialNumber},#{item.remark}, #{item.bindStatus},#{item.updateBy}, #{item.updateTime})
+            ( #{item.batchFlag}, #{item.barcodeType}, #{item.barcodeInfo}, #{item.batchCode}, #{item.materialId}, #{item.barcodeSpec}, #{item.manufacturerId}, #{item.amount}, #{item.purchaseOrderId}, #{item.poNo}, #{item.productionDate}, #{item.acceptedDate}, #{item.lastOutstockDate}, #{item.planCode},#{item.planDetailCode}, #{item.safeFlag},#{item.saleOrderId}, #{item.saleorderCode},#{item.projectNo}, #{item.serialNumber},#{item.remark}, #{item.bindStatus},#{item.updateBy}, #{item.updateTime})
         </foreach>
     </insert>
 
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
index 008f0cb..7c4cf44 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
@@ -36,6 +36,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="approveDate" column="approve_date"/>
         <result property="erpModifyDate" column="erp_modify_date"/>
+        <result property="safeStockAmount" column="safe_stock_amount"/>
         <result property="warehouseId" column="warehouse_id"/>
         <result property="purchasePriceUnitId" column="purchase_price_unit_id"/>
     </resultMap>
@@ -72,7 +73,8 @@
                bmi.update_by,
                bmi.update_time,
                bmi.approve_date,
-               bmi.erp_modify_date
+               bmi.erp_modify_date,
+               bmi.safe_stock_amount
         from mes_base_material_info bmi
                  left join mes_base_material_type bmt on bmt.matrial_type_id = bmi.material_type_id
     </sql>
@@ -216,6 +218,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="approveDate != null">approve_date = #{approveDate},</if>
+            <if test="safeStockAmount != null">safe_stock_amount = #{safeStockAmount},</if>
             <if test="erpModifyDate != null">erp_modify_date = #{erpModifyDate},</if>
             <if test="alwaysFlag != null">always_flag = #{alwaysFlag},</if>
             <if test="batchAmount != null">batch_amount = #{batchAmount},</if>
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
index ba3e6d1..d7c18ea 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
         <result property="bindAmount"    column="bind_amount"    />
+        <result property="barcodeAmount"    column="barcode_amount"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMesOrderBindVo">
-        select order_bind_id, safe_flag, sale_order_id, sale_order_code, product_id, product_code, product_name, purchase_order_id, po_no, material_id, material_code, material_name, bind_amount, remark, create_by, create_time, update_by, update_time from mes_order_bind
+        select order_bind_id, safe_flag, sale_order_id, sale_order_code, product_id, product_code, product_name, purchase_order_id, po_no, material_id, material_code, material_name, bind_amount, barcode_amount,remark, create_by, create_time, update_by, update_time from mes_order_bind
     </sql>
 
     <select id="selectMesOrderBindList" parameterType="MesOrderBind" resultMap="MesOrderBindResult">
@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialCode != null">material_code = #{materialCode},</if>
             <if test="materialName != null">material_name = #{materialName},</if>
             <if test="bindAmount != null">bind_amount = #{bindAmount},</if>
+            <if test="barcodeAmount != null">barcode_amount = #{barcodeAmount},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml
index cd591fb..fc4aed4 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml
@@ -43,6 +43,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="saleBindAmount"    column="sale_bind_amount"    />
         <result property="safeAmount"    column="safe_amount"    />
         <result property="barcodeAmount"    column="barcode_amount"    />
+
+        <result property="batchFlag"    column="batch_flag"    />
+        <result property="batchAmount"    column="batch_amount"    />
+        <result property="mesMaterialId"    column="mes_material_id"    />
+
+        <result property="orderBindBarcodeAmount"    column="order_bind_barcode_amount"    />
+        <result property="safeBindBarcodeAmount"    column="safe_bind_barcode_amount"    />
     </resultMap>
 
     <resultMap id="MesPurchaseOrderMesOrderBindResult" type="MesPurchaseOrder" extends="MesPurchaseOrderResult">
@@ -230,8 +237,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mpo.po_no,
         mpo.document_status,
         mpo.material_id,
-        mpo.material_code,
-        mpo.material_name,
+        mbmi.material_code,
+        mbmi.material_name,
         mbmi.material_spec,
         mpo.aux_prop_id,
         mpo.specification_parameter,
@@ -254,15 +261,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where mob.purchase_order_id = mpo.purchase_order_id
         and mob.safe_flag = '1') barcode_amount
         from mes_purchase_order mpo
-        left join mes_base_material_info mbmi on mbmi.material_id = mpo.material_id
+        left join mes_base_material_info mbmi on mbmi.erp_id = mpo.material_id
         <where>
             <if test="poNo != null  and poNo != ''"> and mpo.po_no like concat('%', #{poNo}, '%')</if>
-            <if test="materialCode != null  and materialCode != ''"> and mpo.material_code like concat('%', #{materialCode}, '%')</if>
-            <if test="materialName != null  and materialName != ''"> and mpo.material_name like concat('%', #{materialName}, '%')</if>
+            <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code like concat('%', #{materialCode}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
             <if test="specificationParameter != null  and specificationParameter != ''"> and mpo.specification_parameter like concat('%', #{specificationParameter}, '%')</if>
             <if test="materialSpec != null  and materialSpec != ''"> and mbmi.material_spec like concat('%', #{materialSpec}, '%')</if>
         </where>
-        order by mpo.po_no ,mpo.material_code
+        order by mpo.erp_modify_date desc,mpo.po_no ,mpo.material_name
     </select>
 
     <select id="saleBindPurchaseOrderList" parameterType="MesPurchaseOrder" resultMap="MesPurchaseOrderResult">
@@ -272,8 +279,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mpo.po_no,
                mpo.document_status,
                mpo.material_id,
-               mpo.material_code,
-               mpo.material_name,
+               mbmi.material_code,
+               mbmi.material_name,
                mbmi.material_spec,
                mpo.specification_parameter,
                mpo.order_amount,
@@ -284,9 +291,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="saleOrderId != null "> and mob.sale_order_id = #{saleOrderId}</if>
             <if test="poNo != null  and poNo != ''"> and mpo.po_no = #{poNo}</if>
-            <if test="materialCode != null  and materialCode != ''"> and mpo.material_code = #{materialCode}</if>
-            <if test="materialName != null  and materialName != ''"> and mpo.material_name like concat('%', #{materialName}, '%')</if>
+            <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code = #{materialCode}</if>
+            <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
+        </where>
+    </select>
+
+
+
+
+
+
+
+
+
+
+    <select id="selectPurchaseOrderBindList" parameterType="MesPurchaseOrder" resultMap="MesPurchaseOrderResult">
+        select mpo.purchase_order_id,
+        mpo.erp_id,
+        mpo.fentry_id,
+        mpo.po_no,
+        mpo.document_status,
+        mpo.material_id,
+        mbmi.material_code,
+        mbmi.material_name,
+        mbmi.material_spec,
+        mbmi.batch_flag,
+        mbmi.batch_amount,
+        mbmi.material_id as mes_material_id,
+        mpo.aux_prop_id,
+        mpo.specification_parameter,
+        mpo.order_amount,
+        (select concat(ifnull(sum(bind_amount),0),'-',ifnull(sum(barcode_amount),0))
+        from mes_order_bind mob where mob.purchase_order_id=mpo.purchase_order_id and mob.safe_flag='0') order_bind_barcode_amount,
+        (select concat(ifnull(sum(bind_amount),0),'-',ifnull(sum(barcode_amount),0))
+        from mes_order_bind mob where mob.purchase_order_id=mpo.purchase_order_id and mob.safe_flag='1') safe_bind_barcode_amount
+        from mes_purchase_order mpo
+        left join mes_base_material_info mbmi on mbmi.erp_id = mpo.material_id
+        <where>
+            <if test="poNo != null  and poNo != ''"> and mpo.po_no like concat('%', #{poNo}, '%')</if>
+            <if test="materialCode != null  and materialCode != ''"> and mbmi.material_code like concat('%', #{materialCode}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and mbmi.material_name like concat('%', #{materialName}, '%')</if>
+            <if test="specificationParameter != null  and specificationParameter != ''"> and mpo.specification_parameter like concat('%', #{specificationParameter}, '%')</if>
+            <if test="materialSpec != null  and materialSpec != ''"> and mbmi.material_spec like concat('%', #{materialSpec}, '%')</if>
         </where>
+        order by mpo.erp_modify_date desc,mpo.po_no ,mpo.material_name
     </select>
 
 </mapper>