From c0261580ec4dfe6d86aa80f2c239dc39d3094f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 20 Aug 2025 12:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/WmsPrintController.java    | 27 +++++++++++++++
 .../gaotao/modules/wms/dao/WmsPrintDao.java   |  7 ++++
 .../modules/wms/service/WmsPrintService.java  | 11 ++++++
 .../wms/service/impl/WmsPrintServiceImpl.java | 17 ++++++++++
 .../resources/mapper/wms/WmsPrintMapper.xml   | 34 +++++++++++++++++--
 5 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java
index c24a9ae..10b7780 100644
--- a/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java
+++ b/src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java
@@ -60,4 +60,31 @@ public class WmsPrintController {
         wmsPrintService.submitPoOrderRollNo( inData);
         return R.ok();
     }
+
+    /**
+     *
+     * @description 删除标签
+     * @author 常熟吴彦祖
+     * @date 2025/8/20 10:24
+     * @return R
+     */
+    @PostMapping("deletePoPartLabelData")
+    public R deletePoPartLabelData(@RequestBody List<PoOrderRollNoOutData> inList){
+        wmsPrintService.deletePoPartLabelData( inList);
+        return R.ok();
+    }
+
+    /**
+     *
+     * @description 获取标签打印数据
+     * @author 常熟吴彦祖
+     * @date 2025/8/20 11:01
+     * @return R
+     */
+    @PostMapping("getPoPartLabelData")
+    public R getPoPartLabelData(@RequestBody List<PoOrderRollNoOutData> inList){
+
+        List<PoOrderRollNoOutData> rows = wmsPrintService.getPoPartLabelData( inList);
+        return R.ok().put("rows", rows);
+    }
 } 
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java b/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java
index db75c9e..cf9a8ae 100644
--- a/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java
+++ b/src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java
@@ -32,4 +32,11 @@ public interface WmsPrintDao {
 
     PoOrderRollNoOutData getInboundQcResultOtherData(InboundQcResultData inData);
     void savePoOrderRollNo(PoOrderRollNoOutData inData);
+
+    void deletePoPartLabelData(PoOrderRollNoOutData inData);
+
+    void updatePrintFlag(@Param("site")String site,@Param("buNo")String buNo,@Param("rollList") List<PoOrderRollNoOutData> inList);
+
+    List<PoOrderRollNoOutData> getPoPartLabelData(@Param("site")String site,@Param("buNo")String buNo,@Param("rollList") List<PoOrderRollNoOutData> inList);
+
 } 
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java
index 7c12099..1efe56f 100644
--- a/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java
+++ b/src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java
@@ -28,4 +28,15 @@ public interface WmsPrintService  {
     PoOrderRollNoOutData getInboundQcResultOtherData(InboundQcResultData inData);
 
     void submitPoOrderRollNo(PoOrderRollNoOutData inData);
+
+    /**
+     *
+     * @description
+     * @author 常熟吴彦祖
+     * @date 2025/8/20 10:24
+     * @return void
+     */
+    void deletePoPartLabelData( List<PoOrderRollNoOutData> inList);
+
+    List<PoOrderRollNoOutData> getPoPartLabelData( List<PoOrderRollNoOutData> inList);
 } 
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java b/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java
index 9ff441f..fd42588 100644
--- a/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @CLASSNAME WmsPrintServiceImpl
@@ -96,4 +97,20 @@ public class WmsPrintServiceImpl implements WmsPrintService {
 
 
     }
+
+    @Override
+    @Transactional
+    public List<PoOrderRollNoOutData> getPoPartLabelData( List<PoOrderRollNoOutData> inList){
+
+        wmsPrintDao.updatePrintFlag(inList.get(0).getSite(),inList.get(0).getBuNo(),inList);
+        return wmsPrintDao.getPoPartLabelData(inList.get(0).getSite(),inList.get(0).getBuNo(),inList);
+    }
+
+    @Override
+    @Transactional
+    public void deletePoPartLabelData( List<PoOrderRollNoOutData> inList){
+        for (int i = 0; i < inList.size(); i++) {
+            wmsPrintDao.deletePoPartLabelData(inList.get(i));
+        }
+    }
 } 
\ No newline at end of file
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 72abd3d..6f296f6 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -30,10 +30,10 @@
                 and c.SupplierName like '%'+ #{query.supplierName} +'%'
             </if>
             <if test="query.poOrderNo != null and query.poOrderNo != ''">
-                and c.po_orderNo like '%'+ #{query.poOrderNo} +'%'
+                and b.po_orderNo like '%'+ #{query.poOrderNo} +'%'
             </if>
             <if test="query.poItemNo != null and query.poItemNo != ''">
-                and c.po_itemNo =  #{query.supplierName}
+                and b.po_itemNo =  #{query.supplierName}
             </if>
         </where>
     </select>
@@ -76,4 +76,34 @@
         #{createdBy},GetDate(),#{delflag},#{version},#{printFlag},
         #{hardtagInFlag},#{batchNo},#{productionDate},#{expirationWarningDate},#{expirationDate})
     </insert>
+
+    <delete id="deletePoPartLabelData">
+        delete from  po_order_roll_no where site=#{site} and bu_no=#{buNo} and roll_no=#{rollNo} and inspection_no=#{inspectionNo}
+    </delete>
+
+    <update id="updatePrintFlag">
+        update po_order_roll_no set print_flag=isnull(print_flag,0)+1
+        WHERE
+        site = #{site}  <!-- 先过滤 site -->
+        and bu_no=#{buNo}
+        AND roll_no IN
+        <foreach item="item" collection="rollList" open="(" separator="," close=")">
+            #{item.rollNo}
+        </foreach>
+    </update>
+
+    <select id="getPoPartLabelData" resultType="PoOrderRollNoOutData">
+        select site,bu_no,inspection_no,order_no,item_no,roll_no,roll_qty,part_no,part_desc,supplier_id,supplier_name,order_qty,
+               created_by,created_date,delflag,version,print_flag,
+               hardtag_in_flag,batch_no,production_date,expiration_warning_date,expiration_date
+        from po_order_roll_no
+        WHERE
+        site = #{site}  <!-- 先过滤 site -->
+        and bu_no=#{buNo}
+        AND roll_no IN
+        <foreach item="item" collection="rollList" open="(" separator="," close=")">
+            #{item.rollNo}
+        </foreach>
+        order by created_date
+    </select>
 </mapper>