From b91f9071315ec645a69a9303ea1afb811671076a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Sat, 23 May 2026 15:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E4=BB=B6=E5=85=A5=E5=BA=93=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8wms=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MacToolUseServiceImpl.java      |  4 +++-
 .../produce/service/impl/PdaSaveServiceImpl.java | 16 ++++++++++++----
 .../service/impl/WorkOrderServiceImpl.java       |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
index 31ed781d6..8d6869515 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
@@ -36,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -348,7 +350,7 @@ public class MacToolUseServiceImpl extends BaseServiceImpl<MacToolUseMapper, Mac
 
     @Override
     public List<MacToolUse> listByNoFinished() {
-        return this.list(Wrappers.lambdaQuery(MacToolUse.class).eq(MacToolUse::getFinished, 0).orderByAsc(MacToolUse::getMtnCode));
+        return this.list(Wrappers.lambdaQuery(MacToolUse.class).eq(MacToolUse::getFinished, 0).ge(MacToolUse::getCreateTime, Date.from(LocalDateTime.now().minusDays(2).atZone(ZoneId.systemDefault()).toInstant())).orderByAsc(MacToolUse::getMtnCode));
     }
 
     private Double setMaxHeat(Map<String, JSONObject> eUMap, JSONObject jsonObject, Double heat) {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
index 276731934..19cf8fd6d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
@@ -61,6 +61,7 @@ import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.enums.DictEnum;
+import org.springblade.wms.feign.WmsTaskClient;
 import org.springblade.wms.pojo.entity.StClassRequest;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -128,6 +129,9 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     private final IBsSafePatrolInspectionService inspectionService;
     private final IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService;
     private final IBsDosingRecService bsDosingRecService;
+    @Resource
+    private WmsTaskClient wmsTaskClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void bindingCard(DeviceBindDTO deviceBindDTO) {
@@ -1083,8 +1087,8 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     @Override
     public void saveSubOrder(SaveSubOrderVo subOrder) {
         Long wpId = subOrder.getWpId();
-//        Long shId = subOrder.getWpId();
-//        Long cslId = subOrder.getWpId();
+        Long shId = subOrder.getWpId();
+        Long cslId = subOrder.getWpId();
         if (wpId == null) {
             throw new ServiceException("参数异常!");
         }
@@ -1108,8 +1112,12 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         }
 
         Date nowDate = new Date();
-        //进行入库
-//        stRealtimeStockWebService.saveSubOrderWarehousing(yo.getPartCode(), wo.getBatchNo(), wo.getMakeQty(), shId, cslId, nowDate, AuthUtil.getUserId());
+        try {
+            //进行入库
+            wmsTaskClient.saveSubOrderWarehousing(yo.getPartCode(), wo.getBatchNo(), wo.getMakeQty(), shId, cslId, nowDate, AuthUtil.getUserId());
+        } catch (Exception e) {
+            log.error("子件入库调用失败：{}", e.getMessage());
+        }
         //当前工序完工
         wp.setFactEndTime(nowDate);
         wp.setStatus(WorkPlan.STATUS_COMPLETE);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 53a453af6..362d2481d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -2178,7 +2178,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
             if (yieldOrder.getFatherYoId() != null) {
                 YieldOrder fatherYieldOrder = yieldOrderService.getById(yieldOrder.getFatherYoId());
-                // 玻璃封接退火
+                // 玻璃封接退火工序调用玻璃饼出库
                 if (yieldOrder.getYieldType() == YieldOrderEnum.YIELD_TYPE_4.getCode() && 63 == wp.getPpsId()) {
                     StGlassCakeOutDTO stGlassCakeOutDTO = new StGlassCakeOutDTO();
                     stGlassCakeOutDTO.setYoCode(fatherYieldOrder.getYoCode());