From a287bb265a32d85cbcc7810d32954a152f47baf4 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 4 Aug 2026 15:01:04 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E9=9C=80=E6=B1=82=E5=8D=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BC=98=E5=8C=96=E4=B8=BA=E9=80=BB=E8=BE=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pm_manage/demand/service/dao/PmDemand.java   |  3 +++
 .../demand/service/dao/mapper/xml/PmDemandMapper.xml |  4 ++--
 .../pm_manage/demand/service/dto/PmDemandDto.java    |  1 +
 .../demand/service/impl/PmDemandServiceImpl.java     | 12 ++++++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/PmDemand.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/PmDemand.java
index 96231b1..61fa709 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/PmDemand.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/PmDemand.java
@@ -56,6 +56,9 @@ public class PmDemand extends Model<PmDemand> {
     @TableField("production_line")
     private String production_line;
 
+    @TableField("is_deleted")
+    private Integer is_deleted;
+
     private String sn;
 
     @TableField("create_at")
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/mapper/xml/PmDemandMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/mapper/xml/PmDemandMapper.xml
index 263631b..6ce2178 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/mapper/xml/PmDemandMapper.xml
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dao/mapper/xml/PmDemandMapper.xml
@@ -17,6 +17,7 @@
         <result property="targetArea" column="target_area"/>
         <result property="targetHouseCode" column="target_house_code"/>
         <result property="carrierType" column="carrier_type"/>
+        <result property="isDeleted" column="is_deleted"/>
         <result property="productionLine" column="production_line"/>
         <result property="sn" column="sn"/>
         <result property="createAt" column="create_at"/>
@@ -26,7 +27,7 @@
     <select id="queryPage" resultMap="DemandDtoMap">
         select *
         from pm_demand
-        <where>
+        where is_deleted = 0
             <if test="query.id != null and query.id != ''">
                 and id = #{query.id}
             </if>
@@ -54,7 +55,6 @@
             <if test="query.endTime != null and query.endTime != ''">
                 and create_time &lt;= #{query.endTime}
             </if>
-        </where>
         order by priority desc, create_time desc
     </select>
 </mapper>
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandDto.java
index 2e88fb4..1edc997 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandDto.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandDto.java
@@ -27,4 +27,5 @@ public class PmDemandDto implements Serializable {
     private String sn;
     private String createAt;
     private String inventoryDis;
+    private Integer isDeleted;
 }
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java
index 2522f9a..26c27b9 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java
@@ -112,15 +112,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         demand.setCarrier_type(param.getCarrierType());
         demand.setProduction_line(param.getProductionLine());
         demand.setSn(param.getSn());
+        demand.setIs_deleted(0);
         demand.setCreate_at(DateUtil.now());
         this.save(demand);
     }
 
     @Override
     public void batchCreate(List<PmDemandParam> param) {
-        final List<String> collect = param.stream().map(PmDemandParam::getId).collect(Collectors.toList());
-        final List<PmDemand> pmDemands = this.listByIds(collect);
-        if (!CollectionUtils.isEmpty(pmDemands)){
+        final List<String> orders = param.stream().map(PmDemandParam::getWorkOrder).collect(Collectors.toList());
+        final int count = this.count(new LambdaQueryWrapper<PmDemand>()
+                .in(PmDemand::getWork_order, orders)
+                .eq(PmDemand::getIs_deleted,0));
+        if (count>0){
             throw new BadRequestException("MES推送需求单失败，需求单已存在");
         }
         for (PmDemandParam pmDemandParam : param) {
@@ -158,7 +161,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        this.removeByIds(ids);
+        this.update(new LambdaUpdateWrapper<PmDemand>().in(PmDemand::getId,ids)
+                .set(PmDemand::getIs_deleted,1));
     }