From 52cba5b577a1f0e5e937c44e964bee360d916e68 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Thu, 6 Nov 2025 11:08:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/controller/ProductionIssueController.java     | 5 ++++-
 .../production/service/impl/ProductionIssueServiceImpl.java  | 3 +++
 src/main/resources/mapper/notify/NewIssureMapper.xml         | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java b/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java
index 88d3040..efb0dc7 100644
--- a/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java
+++ b/src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java
@@ -56,7 +56,10 @@ public class ProductionIssueController {
     public R getWorkOrderInfo(@RequestBody DirectIssueDto dto){
         try {
             List<ShopOrderVo> workOrders = productionIssueService.getWorkOrderInfo(dto.getWorkOrderNo(), dto.getSite());
-            return R.ok().put("workOrders", workOrders);
+            if(workOrders != null && workOrders.size() > 0){
+                return R.ok().put("workOrders", workOrders);
+            }
+            return R.error("工单不存在");
         } catch (Exception e) {
             return R.error(e.getMessage());
         }
diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java
index 09c7eb2..777384b 100644
--- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java
@@ -89,6 +89,9 @@ public class ProductionIssueServiceImpl implements ProductionIssueService {
         List<ShopOrderVo> orderInfo = ifsApiIssueAndReturnService.getWorkOrderInfo(workOrderNo, site, "*", "*");
         Set<String> allowedStatuses = new HashSet<>(Arrays.asList("Released", "Reserved", "Started"));
         List<ShopOrderVo> shopOrderVos = orderInfo.stream().filter(item -> allowedStatuses.contains(item.getObjstate())).collect(Collectors.toList());
+        if(orderInfo.size() >0 && shopOrderVos.size() == 0){
+            throw new XJException("工单"+workOrderNo+"状态不允许发料");
+        }
         return shopOrderVos;
     }
 
diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml
index 6790f66..b93f5b8 100644
--- a/src/main/resources/mapper/notify/NewIssureMapper.xml
+++ b/src/main/resources/mapper/notify/NewIssureMapper.xml
@@ -77,9 +77,9 @@
     <!-- AI制作 - 查询申请单明细 -->
     <select id="searchNotifyOrderListNew" resultType="SOIssueNotifyOrderListData">
         select a.notify_no as notifyNo,a.site,a.item_no as itemNo,a.fgpart_no as fgPartNo,a.soorder_no as soorderNo,a.ops_item_no as opsItemNo,a.seq_no as seqNo,
-               a.issure_qty as issureQty,a.location_no as locationNo,a.need_date as needDate,a.out_work_order_flag as outWorkOrderFlag,a.release_no as releaseNo,a.sequence_no as sequenceNo
+               a.issure_qty as issureQty,a.location_no as locationNo,a.need_date as needDate,a.out_work_order_flag as outWorkOrderFlag,a.release_no as releaseNo,a.sequence_no as sequenceNo,a.push_wms_flag as pushWmsFlag,a.transport_flag as transportFlag
         from SOIssueNotifyOrderList a
-        where a.notify_no=#{notifyNo} and a.site=#{site}
+        where a.notify_no=#{notifyNo} and a.site=#{site} and a.order_type='shoporder'
         order by a.item_no
     </select>