From fd92098d443c92405caa75b11301eed0ddd1eb04 Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Fri, 21 Feb 2025 08:21:21 +0800
Subject: [PATCH] 2025-02-21
---
.../net/xdclass/shopmanager/controller/SubController.java | 6 +++---
.../src/main/resources/mapper/SubMapper.xml | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
index 72e220c..79a17ee 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
@@ -762,7 +762,7 @@ public class SubController {
e.getLtInfoGPreOrder().parallelStream().forEach(f -> {
try {
-// 化学成分 chemical composition
+ //化学成分 chemical composition
if (!ChkChemical(SInfo, f)) {
return;
}
@@ -879,7 +879,7 @@ public class SubController {
logger.info("*************************化学成分订单号：{}-{}-{}", GrpOrd.getOrderNo(), intOrd, intRX);
}
if (plistQdToLineupResultCheDO.stream().anyMatch(p -> p.getOrderNo().equals(GrpOrd.getOrderNo()) && p.getCheType().equals("RX"))) {
- ltLrc = plistQdToLineupResultCheDO.stream().filter(p -> p.getOrderNo().equals(SInfo.getOrderNo()) && p.getCheType().equals("RX")).collect(Collectors.toList());
+ ltLrc = plistQdToLineupResultCheDO.stream().filter(p -> p.getOrderNo().equals(GrpOrd.getOrderNo()) && p.getCheType().equals("RX")).collect(Collectors.toList());
}
//信息不存在返回
@@ -1438,7 +1438,7 @@ public class SubController {
&& finalPpcpa.getOrderThick().intValue() <= p.getOrderThickMax().intValue()
&& p.getDelivyDateFrom().compareTo(finalPpcpa.getDelivyDate()) <= 0
&& finalPpcpa.getDelivyDate().compareTo(p.getDelivyDateTo()) <= 0).count() <= 0) {
- logger.info("订单：{} 不可自动组板，尺寸厚度{},宽度{},交货期{} 不在范围内", i.getOrderNo(), finalPpcpa.getOrderThick(), finalPpcpa.getOrderWidth(), new SimpleDateFormat("yyyy-MM-dd").format(finalPpcpa.getDelivyDate()));
+// logger.info("订单：{} 不可自动组板，尺寸厚度{},宽度{},交货期{} 不在范围内", i.getOrderNo(), finalPpcpa.getOrderThick(), finalPpcpa.getOrderWidth(), new SimpleDateFormat("yyyy-MM-dd").format(finalPpcpa.getDelivyDate()));
return;
}
diff --git a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
index dc98a87..0203fc4 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -29,6 +29,7 @@
LEFT JOIN PM_PD_CONST_BT PPCB ON PPCB.ROLL_LINE_NO = SUBSTR(MS.MSC_LINE_NO, 3, 2)
WHERE 1 = 1
AND MS.MSC_LINE_NO = '1030' --5米轧线
+ AND MS.SLAB_NO = 'C50010630200'
-- AND MS.SLAB_NO = 'C50015130500'
-- AND MS.SLAB_NO = 'C50015130100'
AND MS.SLAB_NO = #{slabNo}
@@ -55,6 +56,7 @@
LEFT JOIN PM_PD_CONST_BT PPCB ON PPCB.ROLL_LINE_NO = SUBSTR(MS.MSC_LINE_NO, 3, 2)
WHERE 1 = 1
AND MS.MSC_LINE_NO = '1030' --5米轧线
+-- AND MS.SLAB_NO = 'C50010630200'
-- AND MS.SLAB_NO = 'C50015130500'
-- AND MS.SLAB_NO = 'C50015130100'
AND MS.SLAB_NO = #{slabNo}
@@ -82,6 +84,8 @@
AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
-- AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
WHERE 1=1
+ AND pcmt.MSC_LINE_NO ='1030'
+-- AND ppc.ORDER_NO IN ('52500003002','52500036002')
-- AND ppc.ORDER_NO='522484Q020'
AND PCMT.FUR_TYPE ='C' --加热炉类型 C 没有注解，C和S 都代表什么
AND ppcpa.ORDER_TYPE_CODE != 'QFH'
@@ -102,6 +106,8 @@
AND ppc.PRO_CONT_ID = pcmt.PRO_CONT_ID
-- AND cm.MSC_LINE_NO = pcmt.MSC_LINE_NO --PM_PRO_CONT没有MSC_LINE_NO
WHERE 1=1
+ AND pcmt.MSC_LINE_NO ='1030'
+-- AND ppc.ORDER_NO IN ('52500003002','52500036002')
-- AND ppc.ORDER_NO='522484Q020'
AND PCMT.FUR_TYPE ='C' --加热炉类型 C 没有注解，C和S 都代表什么
AND ppcpa.ORDER_TYPE_CODE != 'QFH'