From 4aeccff3d01495c61aa5d922fe3de4a43d009218 Mon Sep 17 00:00:00 2001
From: sunhao <479527147@qq.com>
Date: Thu, 23 Jan 2025 17:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shopmanager/controller/SubController.java | 10 +++--
.../xdclass/shopmanager/mapper/SubMapper.java | 4 ++
.../shopmanager/service/SubService.java | 6 +++
.../service/impl/SubServiceImpl.java | 13 ++++++
.../src/main/resources/application.properties | 16 +++----
.../src/main/resources/mapper/SubMapper.xml | 45 +++++++++++++++++++
6 files changed, 83 insertions(+), 11 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 d51e0a2..a7fc412 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
@@ -1590,7 +1590,7 @@ public class SubController {
pmSubHisDO.setSubInfo(""); // 处理内容，假设没有对应字段，设置为默认值
pmSubHisDO.setProcessCode(""); // 进程代码，假设没有对应字段，设置为默认值
pmSubHisDO.setFormPlateMode(""); // 组板方式，假设没有对应字段，设置为默认值
- pmSubHisDO.setStNo(""); // 内部钢种，假设没有对应字段，设置为默认值
+ pmSubHisDO.setStNo(SInfo.getStNo()); // 内部钢种，假设没有对应字段，设置为默认值
pmSubHisDO.setSubTime(new Date()); // 替代时间，假设没有对应字段，设置为当前时间
pmSubHisDO.setCreationDate(new Date()); // 创建时间
pmSubHisDO.setCreatedBy(BigDecimal.valueOf(781L)); // 创建人ID，假设没有对应字段，设置为默认值
@@ -1634,7 +1634,7 @@ public class SubController {
pmSubOrdDO.setStNo(SInfo.getStNo()); // 内部钢种
pmSubOrdDO.setOrderThick(gPreOrder.getThk()); // 订货厚度
pmSubOrdDO.setOrderWidth(BigDecimal.valueOf(gPreOrder.getWid())); // 订货宽度
- pmSubOrdDO.setLenAim(BigDecimal.valueOf(gPreOrder.getIntActLen())); // 订货长度
+ pmSubOrdDO.setLenAim(BigDecimal.valueOf(gPreOrder.getLen())); // 订货长度
pmSubOrdDO.setPosX(BigDecimal.valueOf( intX.intValue())); // X坐标，假设默认为0
intX.addAndGet(gPreOrder.getLen()+5);//X坐标
@@ -1663,7 +1663,11 @@ public class SubController {
}
);
}
-
+ // 批量插入数据
+ if (!plistpmSubOrdDO.isEmpty()) {
+ subService.batchInsertPmSubHisDO(plistpmSubHisDO);
+ subService.batchInsert(plistpmSubOrdDO);
+ }
}
// 生成虚拟板坯号的方法
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java
index 1fd6447..4612008 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java
@@ -2,6 +2,7 @@ package net.xdclass.shopmanager.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.xdclass.shopmanager.model.*;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -78,4 +79,7 @@ public interface SubMapper extends BaseMapper<Map> {
// 连铸板坯生产规格基准表
List<PmSlabSpecBtDO> getPmSlabSpecBt();
+ void batchInsert(@Param("list") List<PmSubOrdDO> pmSubOrdDOList);
+
+ void batchInsertPmSubHisDO(@Param("list") List<PmSubHisDO> pmSubHisDOList);
}
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java
index 2b7232f..d3d9187 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java
@@ -1,6 +1,7 @@
package net.xdclass.shopmanager.service;
import net.xdclass.shopmanager.model.*;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -74,4 +75,9 @@ public interface SubService {
//坯料低倍委托实绩表
List<PmSlabSpecBtDO> getPmSlabSpecBt();
+
+ void batchInsert(List<PmSubOrdDO> pmSubOrdDOList);
+
+ void batchInsertPmSubHisDO(List<PmSubHisDO> pmSubHisDOList);
+
}
diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java
index ec91bb7..6b504ab 100644
--- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java
+++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import net.xdclass.shopmanager.mapper.SubMapper;
import net.xdclass.shopmanager.model.*;
import net.xdclass.shopmanager.service.SubService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -186,4 +187,16 @@ public class SubServiceImpl implements SubService {
public List<PmSlabSpecBtDO> getPmSlabSpecBt(){
return subMapper.getPmSlabSpecBt();
}
+
+ @Override
+ public void batchInsert(List<PmSubOrdDO> pmSubOrdDOList) {
+ subMapper.batchInsert(pmSubOrdDOList);
+ }
+
+ @Override
+ public void batchInsertPmSubHisDO(List<PmSubHisDO> pmSubHisDOList) {
+ subMapper.batchInsertPmSubHisDO(pmSubHisDOList);
+ }
+
+
}
diff --git a/1024shop-manager/1024shop-manager/src/main/resources/application.properties b/1024shop-manager/1024shop-manager/src/main/resources/application.properties
index 54a95cd..118fa09 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/application.properties
+++ b/1024shop-manager/1024shop-manager/src/main/resources/application.properties
@@ -6,10 +6,10 @@ server.port=8081
#spring.datasource.username =root
#spring.datasource.password =xdclass.net
-spring.datasource.url=jdbc:oracle:thin:@172.18.15.38:1521/MOMTEST
-spring.datasource.username=xisc_pm
-spring.datasource.password=HZERO1234
-spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+#spring.datasource.url=jdbc:oracle:thin:@172.18.15.38:1521/MOMTEST
+#spring.datasource.username=xisc_pm
+#spring.datasource.password=HZERO1234
+#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
#外网环境
#spring.datasource.url=jdbc:oracle:thin:@118.195.204.252:1521/PYMES
@@ -18,10 +18,10 @@ spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
##测试环境
-#spring.datasource.url=jdbc:oracle:thin:@172.18.15.50:1521/momdev
-#spring.datasource.username=xisc_pm
-#spring.datasource.password=HZERO1234
-#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+spring.datasource.url=jdbc:oracle:thin:@172.18.15.50:1521/momdev
+spring.datasource.username=xisc_pm
+spring.datasource.password=HZERO1234
+spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
#配置mybatis plus打印sql日志
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 bacd6da..44edb66 100644
--- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
+++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
@@ -242,4 +242,49 @@
PM_SLAB_SPEC_BT
</select>
+
+ <!-- 批量插入 PmSubOrdDO 对象 -->
+ <insert id="batchInsert" parameterType="java.util.List">
+ 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
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.id}, #{item.orderNo}, #{item.virtualSlabNo}, #{item.sgSign}, #{item.stNo}, #{item.orderThick}, #{item.orderWidth},
+ #{item.lenAim}, #{item.posX}, #{item.posY}, #{item.delivyDate}, #{item.axisOrd}, #{item.lackNum}, #{item.overNum},
+ #{item.creationDate}, #{item.createdBy}, #{item.lastUpdatedBy}, #{item.lastUpdateDate}, #{item.tenantId},
+ #{item.objectVersionNumber}, #{item.attribute1}, #{item.attribute2}, #{item.attribute3}, #{item.attribute4},
+ #{item.attribute5}, #{item.orderSeqNo}
+ )
+ </foreach>
+ </insert>
+
+ <!-- 批量插入记录 -->
+ <insert id="batchInsertPmSubHisDO" parameterType="java.util.List">
+ 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, TENANT_ID,
+ OBJECT_VERSION_NUMBER, 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
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.id}, #{item.slabNo}, #{item.subYield}, #{item.relYield}, #{item.subResult}, #{item.subInfo}, #{item.processCode},
+ #{item.formPlateMode}, #{item.stNo}, #{item.slabThick}, #{item.slabWid}, #{item.slabLen}, #{item.slabWt}, #{item.subTime},
+ #{item.creationDate}, #{item.createdBy}, #{item.lastUpdatedBy}, #{item.lastUpdateDate}, #{item.tenantId},
+ #{item.objectVersionNumber}, #{item.attribute1}, #{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}
+ )
+ </foreach>
+ </insert>
+
</mapper>