From 74c49cd33bccf85383206a21b889cf09cc396caf Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Wed, 19 Feb 2025 18:54:22 +0800
Subject: [PATCH] 2025-02-19
---
.../shopmanager/controller/SubController.java | 17 ++++++++++------
.../src/main/resources/mapper/SubMapper.xml | 20 +++++++++----------
2 files changed, 21 insertions(+), 16 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 5b54f60..a28575f 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
@@ -221,6 +221,11 @@ public class SubController {
public JsonData SubData(String strSlab) {
SubParams subParams = new SubParams();
subParams.setSlabNo(strSlab);
+
+ if (strSlab==null || strSlab=="")
+ {
+ return null;
+ }
//获取所有数据
GetDataInfo(subParams);
@@ -302,10 +307,10 @@ public class SubController {
try {
//存储数据，组板结果
SaveHisData(p);
- //数据整理
- SetSaveDate(p);
- //保存数据
- SaveData();
+// //数据整理
+// SetSaveDate(p);
+// //保存数据
+// SaveData();
//bOffTaskLineService.saveOffTask(bPlanHeadAndLineVos);
transactionService.commit(transactionStatus);
} catch (Exception e) {
@@ -353,13 +358,13 @@ public class SubController {
subService.InsertPmSubHisDO(plistpmSubHisDO.get(i));
//删选plistpmSubOrdDO中虚拟板坯号等于strGuid的信息
plistpmSubOrdDO.stream()
- .filter(f -> !f.getRelKey().equals(strGuid))
+ .filter(f -> f.getRelKey().equals(strGuid))
.collect(Collectors.toList()).forEach(m -> {
m.setVirtualSlabNo(virtualSlabNo);
subService.InsertPmSubOrdDO(m);
});
gltSelGGrpCalRslt.stream()
- .filter(f -> !f.getRelKey().equals(strGuid))
+ .filter(f -> f.getRelKey().equals(strGuid))
.collect(Collectors.toList()).forEach(m -> {
m.setVirtualSlabNo(virtualSlabNo);
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 ccaf0b0..8fc7820 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -285,32 +285,32 @@
- INSERT INTO PM_SUB_ORD (ORDER_NO, VIRTUAL_SLAB_NO, SG_SIGN, ST_NO, ORDER_THICK, ORDER_WIDTH,
+ INSERT INTO PM_SUB_ORD (ID,ORDER_NO, VIRTUAL_SLAB_NO, SG_SIGN, ST_NO, ORDER_THICK, ORDER_WIDTH,
LEN_AIM, POS_X, POS_Y, DELIVY_DATE, AXIS_ORD, LACK_NUM, OVER_NUM,
CREATION_DATE, CREATED_BY, LAST_UPDATED_BY, LAST_UPDATE_DATE, TENANT_ID,
OBJECT_VERSION_NUMBER, ATTRIBUTE1, ATTRIBUTE2, ATTRIBUTE3, ATTRIBUTE4,
- ATTRIBUTE5, ORDER_SEQ_NO)
- VALUES (#{orderNo}, #{virtualSlabNo}, #{sgSign}, #{stNo}, #{orderThick}, #{orderWidth},
+ ATTRIBUTE5, ORDER_SEQ_NO,REL_KEY,SLAB_NO)
+ VALUES (PM_SUB_ORD_S.NEXTVAL,#{orderNo}, #{virtualSlabNo}, #{sgSign}, #{stNo}, #{orderThick}, #{orderWidth},
#{lenAim}, #{posX}, #{posY}, #{delivyDate}, #{axisOrd}, #{lackNum}, #{overNum},
#{creationDate}, #{createdBy}, #{lastUpdatedBy}, #{lastUpdateDate}, #{tenantId},
#{objectVersionNumber}, #{attribute1}, #{attribute2}, #{attribute3}, #{attribute4},
- #{attribute5}, #{orderSeqNo})
+ #{attribute5}, #{orderSeqNo},#{relKey},#{slabNo})
- INSERT INTO PM_SUB_HIS (SLAB_NO, SUB_YIELD, REL_YIELD, SUB_RESULT, SUB_INFO, PROCESS_CODE,
+ INSERT INTO PM_SUB_HIS (ID,SLAB_NO, SUB_YIELD, REL_YIELD, SUB_RESULT, SUB_INFO, PROCESS_CODE,
FORM_PLATE_MODE, ST_NO, SLAB_THICK, SLAB_WID, SLAB_LEN, SLAB_WT, SUB_TIME,
CREATION_DATE, CREATED_BY, LAST_UPDATED_BY, LAST_UPDATE_DATE, ATTRIBUTE1, ATTRIBUTE2,
ATTRIBUTE3, ATTRIBUTE4,
ATTRIBUTE5, VIRTUAL_SLAB_NO, ROLL_THK, ROLL_WID, ROLL_LEN, HEAD_CUT,
- TAIL_CUT, WID_CUT, SLIT_LEN, NEED_SLAB_LEN, NEED_SLAB_WT)
- VALUES (#{slabNo}, #{subYield}, #{relYield}, #{subResult}, #{subInfo}, #{processCode},
+ TAIL_CUT, WID_CUT, SLIT_LEN, NEED_SLAB_LEN, NEED_SLAB_WT,REL_KEY)
+ VALUES (PM_SUB_HIS_S.NEXTVAL,#{slabNo}, #{subYield}, #{relYield}, #{subResult}, #{subInfo}, #{processCode},
#{formPlateMode}, #{stNo}, #{slabThick}, #{slabWid}, #{slabLen}, #{slabWt}, #{subTime},
#{creationDate}, #{createdBy}, #{lastUpdatedBy}, #{lastUpdateDate}, #{attribute1}, #{attribute2},
#{attribute3}, #{attribute4},
#{attribute5}, #{virtualSlabNo}, #{rollThk}, #{rollWid}, #{rollLen}, #{headCut},
- #{tailCut}, #{widCut}, #{slitLen}, #{needSlabLen}, #{needSlabWt})
+ #{tailCut}, #{widCut}, #{slitLen}, #{needSlabLen}, #{needSlabWt},#{relKey})
@@ -324,7 +324,7 @@
FORM_PLATE_MODE, ST_NO, SLAB_THICK, SLAB_WID, SLAB_LEN, SLAB_WT, SUB_TIME,
CREATION_DATE, CREATED_BY, LAST_UPDATED_BY, LAST_UPDATE_DATE, ATTRIBUTE1, ATTRIBUTE2, ATTRIBUTE3, ATTRIBUTE4,
ATTRIBUTE5, VIRTUAL_SLAB_NO, ROLL_THK, ROLL_WID, ROLL_LEN, HEAD_CUT,
- TAIL_CUT, WID_CUT, SLIT_LEN, NEED_SLAB_LEN, NEED_SLAB_WT
+ TAIL_CUT, WID_CUT, SLIT_LEN, NEED_SLAB_LEN, NEED_SLAB_WT,REL_KEY
)
VALUES
@@ -336,7 +336,7 @@
#{item.attribute2}, #{item.attribute3}, #{item.attribute4},
#{item.attribute5}, #{item.virtualSlabNo}, #{item.rollThk}, #{item.rollWid}, #{item.rollLen},
#{item.headCut},
- #{item.tailCut}, #{item.widCut}, #{item.slitLen}, #{item.needSlabLen}, #{item.needSlabWt}
+ #{item.tailCut}, #{item.widCut}, #{item.slitLen}, #{item.needSlabLen}, #{item.needSlabWt},#{item.relKey}
)