From de5e9ba64215cb8856f3a9cce6a5bde281052968 Mon Sep 17 00:00:00 2001 From: sunhao <479527147@qq.com> Date: Fri, 7 Feb 2025 12:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=A8=8B=E5=BA=8F=EF=BC=8C?= =?UTF-8?q?=E5=9B=BE=E7=A4=BA=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 | 56 ++++++++---- .../xdclass/shopmanager/mapper/SubMapper.java | 4 + .../xdclass/shopmanager/model/PmSubHisDO.java | 2 +- .../xdclass/shopmanager/model/PmSubOrdDO.java | 2 +- .../shopmanager/service/SubService.java | 3 + .../service/impl/SubServiceImpl.java | 10 +++ .../src/main/resources/mapper/SubMapper.xml | 86 +++++++++++++------ .../shopmanager/MyBatisPlusGenerator.java | 2 +- 8 files changed, 119 insertions(+), 46 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 a7fc412..bb08669 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 @@ -161,7 +161,13 @@ public class SubController { for (int i = 0; i < ltInt.size(); i++) { System.out.println(ltInt.get(i)); } - return JsonData.buildSuccess(); + + JsonData xx= new JsonData(); + xx.setCode(0); + xx.setData(ltInt); + xx.setMsg("成功"); + + return xx; } @ApiOperation("数据处理") @@ -1454,7 +1460,7 @@ public class SubController { .divide(SInfo.getSlabActThk().multiply(SInfo.getSlabActWid()), 0, RoundingMode.CEILING); p.setVirtualSlab_Len(virtualSlabLen.intValue()); //板坯重量 - p.setVirtualSlab_Wgt(p.getVirtualSlab_Thk().multiply(BigDecimal.valueOf(p.getVirtualSlab_Len())).multiply(BigDecimal.valueOf(p.getVirtualSlab_Wid()) ).multiply(BigDecimal.valueOf(7.85))); + p.setVirtualSlab_Wgt(p.getVirtualSlab_Thk().multiply(BigDecimal.valueOf(p.getVirtualSlab_Len())).multiply(BigDecimal.valueOf(p.getVirtualSlab_Wid()) ).multiply(BigDecimal.valueOf(7.85)).divide(BigDecimal.valueOf(1000000000), 2, RoundingMode.HALF_UP)); //成材率计算 BigDecimal rolledVolume = p.getCal_Thk() @@ -1545,13 +1551,13 @@ public class SubController { ChosBestRsl(SInfo); //递归 -// //小于最小入炉尺寸 -// if (SInfo.getRemLen().intValue() <2200) -// { -// -// }else{ -// SetGroupCalRslt(SInfo); -// } + ////小于最小入炉尺寸 + //if (SInfo.getRemLen().intValue() <2200) + //{ + // + //}else{ + // SetGroupCalRslt(SInfo); + //} } public void ChosBestRsl(SlabInfoDO SInfo) { @@ -1596,8 +1602,8 @@ public class SubController { pmSubHisDO.setCreatedBy(BigDecimal.valueOf(781L)); // 创建人ID，假设没有对应字段，设置为默认值 pmSubHisDO.setLastUpdatedBy(BigDecimal.valueOf(781L)); // 最近更新人ID，假设没有对应字段，设置为默认值 pmSubHisDO.setLastUpdateDate(new Date()); // 最近更新时间 - pmSubHisDO.setTenantId(BigDecimal.ZERO); // 租户ID，假设没有对应字段，设置为默认值 - pmSubHisDO.setObjectVersionNumber(BigDecimal.ZERO); // 行版本号，用来处理锁，假设没有对应字段，设置为默认值 + //pmSubHisDO.setTenantId(BigDecimal.ZERO); // 租户ID，假设没有对应字段，设置为默认值 + //pmSubHisDO.setObjectVersionNumber(BigDecimal.ZERO); // 行版本号，用来处理锁，假设没有对应字段，设置为默认值 pmSubHisDO.setAttribute1(""); // 假设没有对应字段，设置为默认值 pmSubHisDO.setAttribute2(""); // 假设没有对应字段，设置为默认值 pmSubHisDO.setAttribute3(""); // 假设没有对应字段，设置为默认值 @@ -1641,7 +1647,7 @@ public class SubController { pmSubOrdDO.setPosY(BigDecimal.valueOf(maxRate.getTrimming()+gPreOrder.getWid())); // Y坐标，假设默认为0 pmSubOrdDO.setDelivyDate(new Date()); // 交货日期，假设默认为当前时间 - pmSubOrdDO.setAxisOrd(gPreOrder.getOrderNo()); // 轴合同 + pmSubOrdDO.setAxisOrd("0"); // 轴合同 pmSubOrdDO.setLackNum(BigDecimal.ZERO); // 欠量，假设默认为0 pmSubOrdDO.setOverNum(BigDecimal.ZERO); // 超投，假设默认为0 pmSubOrdDO.setCreationDate(new Date()); // 创建时间 @@ -1664,10 +1670,22 @@ public class SubController { ); } // 批量插入数据 - if (!plistpmSubOrdDO.isEmpty()) { - subService.batchInsertPmSubHisDO(plistpmSubHisDO); - subService.batchInsert(plistpmSubOrdDO); - } +// if (!plistpmSubOrdDO.isEmpty()) { +// subService.batchInsertPmSubHisDO(plistpmSubHisDO); +// subService.batchInsert(plistpmSubOrdDO); +// } + plistpmSubHisDO.forEach(p->{ + + subService.InsertPmSubHisDO(p); + + }); + + plistpmSubOrdDO.forEach(p->{ + + subService.InsertPmSubOrdDO(p); + + }); + } // 生成虚拟板坯号的方法 @@ -1878,9 +1896,9 @@ public class SubController { PmPdPlateCutDO pmPdPlateCutDO = new PmPdPlateCutDO(); pmPdPlateCutDO.setPdMatNo(ggcr.getVirtualSlabNo()); //TODO 粗切类型 粗切位置 位置序号 取值待定 -// pmPdPlateCutDO.setCutType(); -// pmPdPlateCutDO.setPositionType(); -// pmPdPlateCutDO.setPositionSeq(); + //pmPdPlateCutDO.setCutType(); + //pmPdPlateCutDO.setPositionType(); + //pmPdPlateCutDO.setPositionSeq(); pmPdPlateCutDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY pmPdPlateCutDO.setLastUpdatedBy(781L); 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 4612008..c7d149a 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 @@ -82,4 +82,8 @@ public interface SubMapper extends BaseMapper { void batchInsert(@Param("list") List pmSubOrdDOList); void batchInsertPmSubHisDO(@Param("list") List pmSubHisDOList); + + void InsertPmSubHisDO(PmSubHisDO p); + + void InsertPmSubOrdDO(PmSubOrdDO p); } diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubHisDO.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubHisDO.java index 140d0b6..d7508a9 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubHisDO.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubHisDO.java @@ -25,7 +25,7 @@ public class PmSubHisDO implements Serializable { /** * 主键ID */ - private BigDecimal id; + private Long id; /** * 板坯号 diff --git a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubOrdDO.java b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubOrdDO.java index d7c63f0..34d8d90 100644 --- a/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubOrdDO.java +++ b/1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/model/PmSubOrdDO.java @@ -25,7 +25,7 @@ public class PmSubOrdDO implements Serializable { /** * 主键ID */ - private BigDecimal id; + private Long id; /** * 合同号 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 d3d9187..cba7fba 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 @@ -80,4 +80,7 @@ public interface SubService { void batchInsertPmSubHisDO(List pmSubHisDOList); + void InsertPmSubHisDO(PmSubHisDO p); + + void InsertPmSubOrdDO(PmSubOrdDO p); } 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 6b504ab..b30530c 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 @@ -198,5 +198,15 @@ public class SubServiceImpl implements SubService { subMapper.batchInsertPmSubHisDO(pmSubHisDOList); } + @Override + public void InsertPmSubHisDO(PmSubHisDO p) { + subMapper.InsertPmSubHisDO(p); + } + + @Override + public void InsertPmSubOrdDO(PmSubOrdDO p) { + subMapper.InsertPmSubOrdDO(p); + } + } 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 44edb66..7a5c93e 100644 --- a/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml +++ b/1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml @@ -243,48 +243,86 @@ - - + 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 + 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 - - ( - #{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} - ) - + VALUES ( + #{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} + ) + + + + + INSERT INTO PM_SUB_HIS ( + 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}, + #{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} + ) + + + + + - + INSERT INTO PM_SUB_HIS ( - ID, SLAB_NO, SUB_YIELD, REL_YIELD, SUB_RESULT, SUB_INFO, PROCESS_CODE, + 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, + 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 ( - #{item.id}, #{item.slabNo}, #{item.subYield}, #{item.relYield}, #{item.subResult}, #{item.subInfo}, #{item.processCode}, + #{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.creationDate}, #{item.createdBy}, #{item.lastUpdatedBy}, #{item.lastUpdateDate}, #{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} ) + + + + INSERT INTO PM_SUB_ORD ( + 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 + + ( + #{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} + ) + + diff --git a/1024shop-manager/1024shop-manager/src/test/java/net/xdclass/shopmanager/MyBatisPlusGenerator.java b/1024shop-manager/1024shop-manager/src/test/java/net/xdclass/shopmanager/MyBatisPlusGenerator.java index 1340f2b..c1357f0 100644 --- a/1024shop-manager/1024shop-manager/src/test/java/net/xdclass/shopmanager/MyBatisPlusGenerator.java +++ b/1024shop-manager/1024shop-manager/src/test/java/net/xdclass/shopmanager/MyBatisPlusGenerator.java @@ -96,7 +96,7 @@ public class MyBatisPlusGenerator { //.setInclude("QE_TQ_HEATCHE_STAND_RESULT","QE_TQ_PONO_WAIT_TEST","QE_TQ_SLAB_MACRO_RESULT") - //.setInclude("PM_SUB_HIS","PM_SUB_ORD") + .setInclude("PM_SUB_HIS","PM_SUB_ORD") // 生成的表, 支持多表一起生成，以数组形式填写 //TODO TODO TODO TODO 两个方式，直接写，或者使用命令行输入