sunhao
/
XG_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9个表的insert

Browse Source
main
BKGY_MYT 1 week ago
parent 779b891177
commit 3ee1be3d48
6 changed files with 1568 additions and 177 deletions
Show Stats Download Patch File Download Diff File

154
1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java
Unescape Escape View File

@ -253,14 +253,14 @@ public class SubController {
gltSelGGrpCalRslt = new ArrayList<>(); gltSelGGrpCalRslt = new ArrayList<>();
SetGroupCalRslt(p); SetGroupCalRslt(p);
//存储数据，组板结果 // //存储数据，组板结果
plistpmSubHisDO.forEach(e -> { // plistpmSubHisDO.forEach(e -> {
subService.InsertPmSubHisDO(e); // subService.InsertPmSubHisDO(e);
}); // });
//
plistpmSubOrdDO.forEach(e -> { // plistpmSubOrdDO.forEach(e -> {
subService.InsertPmSubOrdDO(e); // subService.InsertPmSubOrdDO(e);
}); // });
logger.info("结果数据板坯号：{}；数量：{}", p.getSlabNo(), gltGGrpCalRslt.size()); logger.info("结果数据板坯号：{}；数量：{}", p.getSlabNo(), gltGGrpCalRslt.size());
} }
@ -1253,6 +1253,10 @@ public class SubController {
GPO.setLen(ppcpa.getOrderLen()); GPO.setLen(ppcpa.getOrderLen());
// 设置厚度公差下限 // 设置厚度公差下限
GPO.setThickTolMin(ppcpa.getThickTolMin()); GPO.setThickTolMin(ppcpa.getThickTolMin());
// 设置厚度公差上限
GPO.setThickTolMax(ppcpa.getThickTolMax());
// 设置实际长度
GPO.setIntActLen(ppcpa.getOrderLen());
// 设置订单号 // 设置订单号
GPO.setOrderNo(prPmProContDO.getOrderNo()); GPO.setOrderNo(prPmProContDO.getOrderNo());
// 关联订单信息对象 // 关联订单信息对象
@ -1385,42 +1389,45 @@ public class SubController {
int intRollMinLen = plistPmPdConstBtDO.stream().filter(p -> p.getRollLineNo().equals("30")).findFirst().orElse(null).getHpmMinPLen().intValue(); int intRollMinLen = plistPmPdConstBtDO.stream().filter(p -> p.getRollLineNo().equals("30")).findFirst().orElse(null).getHpmMinPLen().intValue();
//初始化分组数据 //初始化分组数据
gltGGrpCalRslt = new ArrayList<>(); gltGGrpCalRslt = new CopyOnWriteArrayList<>();
//gltGCalGrp.parallelStream().forEach(e->{ //gltGCalGrp.parallelStream().forEach(e->{
gltGCalGrp.parallelStream().forEach(e -> { gltGCalGrp.parallelStream().forEach(e -> {
//实例化计算结果数组 try {
GGrpCalRslt GGCR = new GGrpCalRslt(); //实例化计算结果数组
//可轧制最大长度 GGrpCalRslt GGCR = new GGrpCalRslt();
int intMaxLen = 0; //可轧制最大长度
//轧制最大宽度 int intMaxLen = 0;
int intWid = e.getWid(); //轧制最大宽度
//轧制最大厚度 int intWid = e.getWid();
BigDecimal intThk = e.getThk(); //轧制最大厚度
//板坯长度 BigDecimal intThk = e.getThk();
int intSlabLen = SInfo.getRemLen().intValue(); //板坯长度
int intSlabLen = SInfo.getRemLen().intValue();
//判断可轧制最大长度 TODO：厚度计算Decimal取整计算，会有误差，后续判断误差值修正计算
if ((SInfo.getRemLen().multiply(SInfo.getSlabActThk()).multiply(SInfo.getRemWid()).divide(intThk.multiply(BigDecimal.valueOf(intWid)), RoundingMode.HALF_UP)).compareTo(BigDecimal.valueOf(intRollMaxLen)) > 0) { //判断可轧制最大长度 TODO：厚度计算Decimal取整计算，会有误差，后续判断误差值修正计算
intMaxLen = intRollMaxLen; if ((SInfo.getRemLen().multiply(SInfo.getSlabActThk()).multiply(SInfo.getRemWid()).divide(intThk.multiply(BigDecimal.valueOf(intWid)), RoundingMode.HALF_UP)).compareTo(BigDecimal.valueOf(intRollMaxLen)) > 0) {
} else { intMaxLen = intRollMaxLen;
intMaxLen = (SInfo.getRemLen().multiply(SInfo.getSlabActThk()).multiply(SInfo.getRemWid()).divide(intThk.multiply(BigDecimal.valueOf(intWid)), RoundingMode.HALF_UP)).intValue(); } else {
} intMaxLen = (SInfo.getRemLen().multiply(SInfo.getSlabActThk()).multiply(SInfo.getRemWid()).divide(intThk.multiply(BigDecimal.valueOf(intWid)), RoundingMode.HALF_UP)).intValue();
//不能小于可轧制的最小长度 }
if (intMaxLen < intRollMinLen) { //不能小于可轧制的最小长度
return; if (intMaxLen < intRollMinLen) {
return;
}
//轧制宽度
GGCR.setCal_Wid(intWid);
//轧制厚度
GGCR.setCal_Thk(intThk);
//订单厚度
GGCR.setThk(e.getLtInfoGPreOrder().get(0).getThk());
//最大长度
GGCR.setCal_Len(intMaxLen);
GGCR.setLtInfoGPreOrder(e.getLtInfoGPreOrder());
gltGGrpCalRslt.add(GGCR);
}catch (Exception ex){
logger.info("***计算结果异常：" + ex.getMessage());
} }
//轧制宽度
GGCR.setCal_Wid(intWid);
//轧制厚度
GGCR.setCal_Thk(intThk);
//订单厚度
GGCR.setThk(e.getLtInfoGPreOrder().get(0).getThk());
//最大长度
GGCR.setCal_Len(intMaxLen);
GGCR.setLtInfoGPreOrder(e.getLtInfoGPreOrder());
gltGGrpCalRslt.add(GGCR);
}); });
if (gltGGrpCalRslt.size() == 0) { if (gltGGrpCalRslt.size() == 0) {
@ -1741,9 +1748,9 @@ public class SubController {
//gltGGrpCalRslt 的 getIntUseF //gltGGrpCalRslt 的 getIntUseF
// 筛选 UseFlg == 1 的数据 // 筛选 UseFlg == 1 的数据
List<GGrpCalRslt> filteredList = gltGGrpCalRslt.stream() List<GGrpCalRslt> filteredList = gltGGrpCalRslt.stream()
.filter(g -> nvl(g.getIntUseFlg(),0) == 1) .filter(g -> Objects.nonNull(g) && Objects.nonNull(g.getIntUseFlg()) && g.getIntUseFlg() == 1)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 找到重量最大成材率最大的数据 // 找到重量最大成材率最大的数据
@ -1913,7 +1920,7 @@ public class SubController {
pmPdSlabDO.setMatDesignKind("S"); pmPdSlabDO.setMatDesignKind("S");
pmPdSlabDO.setPdStatusHp("12"); pmPdSlabDO.setPdStatusHp("12");
pmPdSlabDO.setPdResp("781"); // TODO 组板责任者 未赋值 操作人id pmPdSlabDO.setPdResp("781"); // TODO 组板责任者 未赋值 操作人id
pmPdSlabDO.setFormPlateMode("FormPlateMode"); //TODO 组板方式 未赋值 pmPdSlabDO.setFormPlateMode(""); //TODO 组板方式 未赋值
pmPdSlabDO.setPickModeLenDir(BigDecimal.ZERO); //TODO 取板方式_长度方向 未赋值 pmPdSlabDO.setPickModeLenDir(BigDecimal.ZERO); //TODO 取板方式_长度方向 未赋值
pmPdSlabDO.setPickModeWidDir(BigDecimal.ZERO); //TODO 取板方式_宽度方向 未赋值 pmPdSlabDO.setPickModeWidDir(BigDecimal.ZERO); //TODO 取板方式_宽度方向 未赋值
pmPdSlabDO.setFurType("C");// TODO 加热炉类型 暂时赋值为C pmPdSlabDO.setFurType("C");// TODO 加热炉类型 暂时赋值为C
@ -1969,7 +1976,7 @@ public class SubController {
if (!ultCode.isEmpty()) { if (!ultCode.isEmpty()) {
ultCode = ultCode.substring(0, ultCode.length() - 1); ultCode = ultCode.substring(0, ultCode.length() - 1);
} }
pmPdSlabDO.setUltDetectMethodCode(ultCode); pmPdSlabDO.setUltCode(ultCode);
} }
String ultDetectMethodCode = ""; String ultDetectMethodCode = "";
@ -2025,7 +2032,7 @@ public class SubController {
pmPdSlabDO.setSgSign(SInfo.getSgSign()); pmPdSlabDO.setSgSign(SInfo.getSgSign());
pmPdSlabDO.setStNo(SInfo.getStNo()); pmPdSlabDO.setStNo(SInfo.getStNo());
pmPdSlabDO.setOutSgNo(SInfo.getStNo()); pmPdSlabDO.setOutSgNo(SInfo.getStNo());
pmPdSlabDO.setIngotType(SInfo.getSlabType());
pmPdSlabDO.setPreCleanSlabThick(SInfo.getSlabActThk()); pmPdSlabDO.setPreCleanSlabThick(SInfo.getSlabActThk());
pmPdSlabDO.setPreCleanSlabWidth(SInfo.getSlabActWid()); pmPdSlabDO.setPreCleanSlabWidth(SInfo.getSlabActWid());
pmPdSlabDO.setPreCleanSlabLen(BigDecimal.valueOf(ggcr.getVirtualSlab_Len())); pmPdSlabDO.setPreCleanSlabLen(BigDecimal.valueOf(ggcr.getVirtualSlab_Len()));
@ -2055,7 +2062,7 @@ public class SubController {
pmPdSlabDO.setHpFlameCleanDiv(resultPmContMscTechDO1.get().getFlameCleanDiv()); pmPdSlabDO.setHpFlameCleanDiv(resultPmContMscTechDO1.get().getFlameCleanDiv());
pmPdSlabDO.setSlabFinishCode(resultPmContMscTechDO1.get().getSlabFinishCode()); pmPdSlabDO.setSlabFinishCode(resultPmContMscTechDO1.get().getSlabFinishCode());
Long slabPdQty = plistPmPdSlabInfoDO.stream() Long slabPdQty = plistPmPdSlabInfoDO.stream()
.filter(item -> ggcr.getSlabNo().equals(item.getSlabNo())) .filter(item -> item != null && ggcr != null && ggcr.getSlabNo() != null && ggcr.getSlabNo().equals(item.getSlabNo()))
.count(); .count();
if(slabPdQty > 0){ if(slabPdQty > 0){
Optional<PmPdSlabInfoDO> resultPmPdSlabInfoDO = plistPmPdSlabInfoDO.stream() Optional<PmPdSlabInfoDO> resultPmPdSlabInfoDO = plistPmPdSlabInfoDO.stream()
@ -2115,6 +2122,8 @@ public class SubController {
pmPdSlabDO.setLastUpdatedBy(781L); pmPdSlabDO.setLastUpdatedBy(781L);
pmPdSlabDO.setCreationDate(now); pmPdSlabDO.setCreationDate(now);
pmPdSlabDO.setLastUpdateDate(now); pmPdSlabDO.setLastUpdateDate(now);
pmPdSlabDO.setLastSlabFlag(BigDecimal.valueOf(1));
pmPdSlabDO.setTwoRollInterimFlag(1);
SetPmCmdSlab(pmPdSlabDO);//命令板坯表 SetPmCmdSlab(pmPdSlabDO);//命令板坯表
SetPmCmdLargePlt(pmPdSlabDO, ggcr);//命令大板表 SetPmCmdLargePlt(pmPdSlabDO, ggcr);//命令大板表
@ -2153,12 +2162,14 @@ public class SubController {
pmPdBlockPosDO.setPdMatNo(ggcr.getVirtualSlabNo()); pmPdBlockPosDO.setPdMatNo(ggcr.getVirtualSlabNo());
pmPdBlockPosDO.setOrderNo(orderNoList.get(j)); pmPdBlockPosDO.setOrderNo(orderNoList.get(j));
pmPdBlockPosDO.setOrderSeqNo(j + 1);//TODO 订单序号 暂时以实际订单信息列表顺序 pmPdBlockPosDO.setOrderSeqNo(j + 1);//TODO 订单序号 暂时以实际订单信息列表顺序
Integer blockPlateNum = ggcr.getLtActInfoGPreOrder().stream() // 当前合同号在实际合同列表中的条数 List<GPreOrder> resultGPreOrder = ggcr.getLtActInfoGPreOrder().stream()
.filter(item -> item.getOrderNo().equals(pmPdBlockPosDO.getOrderNo())) .filter(item -> item.getOrderNo().equals(pmPdBlockPosDO.getOrderNo()))
.collect(Collectors.toList()) .collect(Collectors.toList());
.size(); Integer blockPlateNum = resultGPreOrder.size();
pmPdBlockPosDO.setBlockPlateNum(blockPlateNum); pmPdBlockPosDO.setBlockPlateNum(blockPlateNum);
pmPdBlockPosDO.setSlabNo(ggcr.getSlabNo()); pmPdBlockPosDO.setSlabNo(ggcr.getSlabNo());
pmPdBlockPosDO.setProContId(resultGPreOrder.get(0).getInfoPmProContDo().getProContId());
// pmPdBlockPosDO.setOrderBlockNo(); //TODO 厚板组板块号 暂时不知如何赋值 // pmPdBlockPosDO.setOrderBlockNo(); //TODO 厚板组板块号 暂时不知如何赋值
pmPdBlockPosDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY pmPdBlockPosDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY
@ -2190,9 +2201,10 @@ public class SubController {
pmPdContSumDO.setSlabNo(ggcr.getSlabNo()); pmPdContSumDO.setSlabNo(ggcr.getSlabNo());
pmPdContSumDO.setPdMatType("S"); pmPdContSumDO.setPdMatType("S");
pmPdContSumDO.setPdStatus("12"); pmPdContSumDO.setPdStatus("12");
pmPdContSumDO.setProContId(gPreOrders.get(0).getInfoPmProContDo().getProContId());
pmPdContSumDO.setOrderThick(gPreOrders.get(0).getThk()); pmPdContSumDO.setOrderThick(gPreOrders.get(0).getThk());
pmPdContSumDO.setOrderWidth(BigDecimal.valueOf(gPreOrders.get(0).getWid())); pmPdContSumDO.setOrderWidth(BigDecimal.valueOf(gPreOrders.get(0).getWid()));
pmPdContSumDO.setOrderLen(BigDecimal.valueOf(gPreOrders.get(0).getIntActLen())); pmPdContSumDO.setOrderLen(BigDecimal.valueOf(gPreOrders.get(0).getIntActLen())); //20250212
pmPdContSumDO.setOrderLenMax(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMaxLen())); pmPdContSumDO.setOrderLenMax(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMaxLen()));
pmPdContSumDO.setOrderLenMin(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMinLen())); pmPdContSumDO.setOrderLenMin(BigDecimal.valueOf(gPreOrders.get(0).getInfoPmProContProdAttrDO().getOrderMinLen()));
@ -2205,6 +2217,7 @@ public class SubController {
pmPdContSumDO.setLastUpdatedBy(781L); pmPdContSumDO.setLastUpdatedBy(781L);
pmPdContSumDO.setCreationDate(now); pmPdContSumDO.setCreationDate(now);
pmPdContSumDO.setLastUpdateDate(now); pmPdContSumDO.setLastUpdateDate(now);
pmPdContSumDO.setAxisFlag(0);//TODO 轴合同标记，暂时默认0
SetPmCmdCont(pmPdContSumDO, gPreOrders.get(0));//命令参数表 SetPmCmdCont(pmPdContSumDO, gPreOrders.get(0));//命令参数表
pmPdContSumDOList.add(pmPdContSumDO); pmPdContSumDOList.add(pmPdContSumDO);
} }
@ -2220,6 +2233,7 @@ public class SubController {
PmSmallPltPosDO pmSmallPltPosDO = new PmSmallPltPosDO(); PmSmallPltPosDO pmSmallPltPosDO = new PmSmallPltPosDO();
pmSmallPltPosDO.setPdMatNo(ggcr.getVirtualSlabNo()); pmSmallPltPosDO.setPdMatNo(ggcr.getVirtualSlabNo());
pmSmallPltPosDO.setOrderNo(gpo.getOrderNo()); pmSmallPltPosDO.setOrderNo(gpo.getOrderNo());
pmSmallPltPosDO.setProContId(gpo.getInfoPmProContDo().getProContId());
pmSmallPltPosDO.setOrderSeqNo(j + 1); pmSmallPltPosDO.setOrderSeqNo(j + 1);
pmSmallPltPosDO.setSlabNo(ggcr.getSlabNo()); pmSmallPltPosDO.setSlabNo(ggcr.getSlabNo());
Optional<PmProContProdAttrDO> resultPmProContProdAttrDO = plistPmProContProdAttrDO.stream() Optional<PmProContProdAttrDO> resultPmProContProdAttrDO = plistPmProContProdAttrDO.stream()
@ -2279,7 +2293,7 @@ public class SubController {
pmCmdSlabDO.setPreCleanSlabMaxWt(pmPdSlabDO.getPreCleanSlabMaxWt()); pmCmdSlabDO.setPreCleanSlabMaxWt(pmPdSlabDO.getPreCleanSlabMaxWt());
pmCmdSlabDO.setPreCleanSlabMinWt(pmPdSlabDO.getPreCleanSlabMinWt()); pmCmdSlabDO.setPreCleanSlabMinWt(pmPdSlabDO.getPreCleanSlabMinWt());
Long slabPdQty = plistPmPdSlabInfoDO.stream() Long slabPdQty = plistPmPdSlabInfoDO.stream()
.filter(item -> pmPdSlabDO.getSlabNo().equals(item.getSlabNo())) .filter(item -> item != null && pmPdSlabDO != null && pmPdSlabDO.getSlabNo() != null && pmPdSlabDO.getSlabNo().equals(item.getSlabNo()))
.count(); .count();
if(slabPdQty>0){ if(slabPdQty>0){
Optional<PmPdSlabInfoDO> resultPmPdSlabInfoDO = plistPmPdSlabInfoDO.stream() Optional<PmPdSlabInfoDO> resultPmPdSlabInfoDO = plistPmPdSlabInfoDO.stream()
@ -2317,6 +2331,7 @@ public class SubController {
pmCmdSlabDO.setMscLineNo(pmPdSlabDO.getMscLineNo()); pmCmdSlabDO.setMscLineNo(pmPdSlabDO.getMscLineNo());
pmCmdSlabDO.setIngotType(pmPdSlabDO.getIngotType()); pmCmdSlabDO.setIngotType(pmPdSlabDO.getIngotType());
pmCmdSlabDO.setIgMatDesignKind(pmPdSlabDO.getIgMatDesignKind()); pmCmdSlabDO.setIgMatDesignKind(pmPdSlabDO.getIgMatDesignKind());
pmCmdSlabDO.setOrderNoAxis(pmPdSlabDO.getOrderNoAxis());
pmCmdSlabDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY pmCmdSlabDO.setCreatedBy(781L);//TODO 创建人修改人，暂时默认781 BKGY
pmCmdSlabDO.setLastUpdatedBy(781L); pmCmdSlabDO.setLastUpdatedBy(781L);
pmCmdSlabDO.setCreationDate(now); pmCmdSlabDO.setCreationDate(now);
@ -2495,11 +2510,21 @@ public class SubController {
pmCmdContDO.setHeadCut(pmPdSlabDOItem.get().getHeadCut().intValue()); pmCmdContDO.setHeadCut(pmPdSlabDOItem.get().getHeadCut().intValue());
pmCmdContDO.setTailCut(pmPdSlabDOItem.get().getTailCut().intValue()); pmCmdContDO.setTailCut(pmPdSlabDOItem.get().getTailCut().intValue());
pmCmdContDO.setCutModeCode(pmContMscTechDOItem.get().getAdModeCode()); pmCmdContDO.setCutModeCode(pmContMscTechDOItem.get().getAdModeCode());
pmCmdContDO.setGFlag(String.valueOf(pmContMscTechDOItem.get().getGFlag())); if(pmContMscTechDOItem.get().getGFlag() != null){
pmCmdContDO.setCsFlag(String.valueOf(pmContMscTechDOItem.get().getCsFlag())); pmCmdContDO.setGFlag(String.valueOf(pmContMscTechDOItem.get().getGFlag()));
pmCmdContDO.setDssFlag(String.valueOf(pmContMscTechDOItem.get().getDssFlag())); }
pmCmdContDO.setDsFlag(String.valueOf(pmContMscTechDOItem.get().getDsFlag())); if(pmContMscTechDOItem.get().getCsFlag() != null){
pmCmdContDO.setSsFlag(String.valueOf(pmContMscTechDOItem.get().getSsFlag())); pmCmdContDO.setCsFlag(String.valueOf(pmContMscTechDOItem.get().getCsFlag()));
}
if(pmContMscTechDOItem.get().getDssFlag() != null){
pmCmdContDO.setDssFlag(String.valueOf(pmContMscTechDOItem.get().getDssFlag()));
}
if(pmContMscTechDOItem.get().getDsFlag() != null){
pmCmdContDO.setDsFlag(String.valueOf(pmContMscTechDOItem.get().getDsFlag()));
}
if(pmContMscTechDOItem.get().getSsFlag() != null){
pmCmdContDO.setSsFlag(String.valueOf(pmContMscTechDOItem.get().getSsFlag()));
}
pmCmdContDO.setHeatTreatMode(pmContMscTechDOItem.get().getHeatTreatMode()); pmCmdContDO.setHeatTreatMode(pmContMscTechDOItem.get().getHeatTreatMode());
pmCmdContDO.setUltDetectMethodCode(pmContMscTechDOItem.get().getUltDetectMethodCode()); pmCmdContDO.setUltDetectMethodCode(pmContMscTechDOItem.get().getUltDetectMethodCode());
pmCmdContDO.setUltCode(pmPdSlabDOItem.get().getUltCode());//TODO 遍根据合同号从质量模块MES合同主档QD_TO_PO_ORDER读取超声探伤标准1、超声探伤标2、超声探伤标3、超声探伤标4、超声探伤标5，去重后所有数据用‘-’拼接成一条记录 pmCmdContDO.setUltCode(pmPdSlabDOItem.get().getUltCode());//TODO 遍根据合同号从质量模块MES合同主档QD_TO_PO_ORDER读取超声探伤标准1、超声探伤标2、超声探伤标3、超声探伤标4、超声探伤标5，去重后所有数据用‘-’拼接成一条记录
@ -2539,7 +2564,24 @@ public class SubController {
public void SaveData() { public void SaveData() {
subService.batchInsertPmPdSlab(pmPdSlabDOList); subService.batchInsertPmPdSlab(pmPdSlabDOList);
System.out.println("PmPdSlab表一保存成功");
subService.batchInsertPmCmdSlab(pmCmdSlabDOList); subService.batchInsertPmCmdSlab(pmCmdSlabDOList);
System.out.println("PmCmdSlab表二保存成功");
subService.batchInsertPmCmdLargePlt(pmCmdLargePltDOList);
System.out.println("pmCmdLargePltDO 命令大板 保存成功");
subService.batchInsertPmPdPlateCut(pmPdPlateCutDOList);
System.out.println("PmPdPlateCut 大板粗切位置表 保存成功");
subService.batchInsertPmPdBlockPos(pmPdBlockPosDOList);
System.out.println("PmPdBlockPos 组合子板位置表 保存成功");
subService.batchInsertPmPdContSum(pmPdContSumDOList);
System.out.println("PmPdContSum 合同总量表 保存成功");
subService.batchInsertPmSmallPltPos(pmSmallPltPosDOList);
System.out.println("PmSmallPltPos 命令小板位置表 保存成功");
subService.batchInsertPmCmdSmallPlt(pmCmdSmallPltDOList);
System.out.println("PmCmdSmallPlt 命令小板表 保存成功");
subService.batchInsertPmCmdCont(pmCmdContDOList);
System.out.println("PmCmdCont 命令参数 保存成功");
// subService.SaveData(pmPdSlabDOList, pmPdPlateCutDOList, pmPdBlockPosDOList, pmPdContSumDOList, pmSmallPltPosDOList, pmCmdSlabDOList, pmCmdLargePltDOList, pmCmdContDOList, pmCmdSmallPltDOList); // subService.SaveData(pmPdSlabDOList, pmPdPlateCutDOList, pmPdBlockPosDOList, pmPdContSumDOList, pmSmallPltPosDOList, pmCmdSlabDOList, pmCmdLargePltDOList, pmCmdContDOList, pmCmdSmallPltDOList);
} }

36
1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java
Unescape Escape View File

@ -104,9 +104,41 @@ public interface SubMapper extends BaseMapper<Map> {
BigDecimal getMaxPmPdSlabId(); BigDecimal getMaxPmPdSlabId();
void batchInsertPmPdSlab(List<PmPdSlabDO> pmPdSlabDOList); void batchInsertPmPdSlab(@Param("list") List<PmPdSlabDO> pmPdSlabDOList);
void batchInsertPmCmdSlab(List<PmCmdSlabDO> pmCmdSlabDOList); void batchInsertPmCmdSlab(@Param("list") List<PmCmdSlabDO> pmCmdSlabDOList);
BigDecimal getMaxPmCmdSlabId(); BigDecimal getMaxPmCmdSlabId();
void insertPmPdSlab(PmPdSlabDO p);
void insertPmCmdSlab(PmCmdSlabDO pmCmdSlabDO);
BigDecimal getMaxPmCmdLargePltId();
void insertPmCmdLargePlt(PmCmdLargePltDO pmCmdLargePltDO);
BigDecimal getMaxPmPdPlateCutId();
void insertPmPdPlateCut(PmPdPlateCutDO pmPdPlateCutDO);
BigDecimal getMaxPmPdBlockPosId();
void insertPmPdBlockPos(PmPdBlockPosDO pmPdBlockPosDO);
BigDecimal getMaxPmPdContSumId();
void insertPmPdContSum(PmPdContSumDO pmPdContSumDO);
BigDecimal getMaxPmSmallPltPosId();
void insertPmSmallPltPos(PmSmallPltPosDO pmSmallPltPosDO);
BigDecimal getMaxPmCmdSmallPltId();
void insertPmCmdSmallPlt(PmCmdSmallPltDO pmCmdSmallPltDO);
BigDecimal getMaxPmCmdContId();
void insertPmCmdCont(PmCmdContDO pmCmdContDO);
} }

16
1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java
Unescape Escape View File

@ -103,4 +103,20 @@ public interface SubService {
void batchInsertPmPdSlab(List<PmPdSlabDO> pmPdSlabDOList); void batchInsertPmPdSlab(List<PmPdSlabDO> pmPdSlabDOList);
void batchInsertPmCmdSlab(List<PmCmdSlabDO> pmCmdSlabDOList); void batchInsertPmCmdSlab(List<PmCmdSlabDO> pmCmdSlabDOList);
void insertPmPdSlab(PmPdSlabDO p);
void batchInsertPmCmdLargePlt(List<PmCmdLargePltDO> pmCmdLargePltDOList);
void batchInsertPmPdPlateCut(List<PmPdPlateCutDO> pmPdPlateCutDOList);
void batchInsertPmPdBlockPos(List<PmPdBlockPosDO> pmPdBlockPosDOList);
void batchInsertPmPdContSum(List<PmPdContSumDO> pmPdContSumDOList);
void batchInsertPmSmallPltPos(List<PmSmallPltPosDO> pmSmallPltPosDOList);
void batchInsertPmCmdSmallPlt(List<PmCmdSmallPltDO> pmCmdSmallPltDOList);
void batchInsertPmCmdCont(List<PmCmdContDO> pmCmdContDOList);
} }

92
1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java
Unescape Escape View File

@ -254,8 +254,11 @@ public class SubServiceImpl implements SubService {
BigDecimal id = subMapper.getMaxPmPdSlabId(); BigDecimal id = subMapper.getMaxPmPdSlabId();
for (int i = 0 ; i < pmPdSlabDOList.size() ; i++){ for (int i = 0 ; i < pmPdSlabDOList.size() ; i++){
pmPdSlabDOList.get(i).setPmPdSlabId(id.add(BigDecimal.valueOf(i+1))); pmPdSlabDOList.get(i).setPmPdSlabId(id.add(BigDecimal.valueOf(i+1)));
pmPdSlabDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmPdSlabDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmPdSlab(pmPdSlabDOList.get(i));
} }
subMapper.batchInsertPmPdSlab(pmPdSlabDOList); // subMapper.batchInsertPmPdSlab(pmPdSlabDOList);
} }
@Override @Override
@ -263,8 +266,93 @@ public class SubServiceImpl implements SubService {
BigDecimal id = subMapper.getMaxPmCmdSlabId(); BigDecimal id = subMapper.getMaxPmCmdSlabId();
for (int i = 0 ; i < pmCmdSlabDOList.size() ; i++){ for (int i = 0 ; i < pmCmdSlabDOList.size() ; i++){
pmCmdSlabDOList.get(i).setPmCmdSlabId(id.add(BigDecimal.valueOf(i+1))); pmCmdSlabDOList.get(i).setPmCmdSlabId(id.add(BigDecimal.valueOf(i+1)));
pmCmdSlabDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmCmdSlabDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmCmdSlab(pmCmdSlabDOList.get(i));
}
// subMapper.batchInsertPmCmdSlab(pmCmdSlabDOList);
}
@Override
public void insertPmPdSlab(PmPdSlabDO p) {
subMapper.insertPmPdSlab(p);
}
@Override
public void batchInsertPmCmdLargePlt(List<PmCmdLargePltDO> pmCmdLargePltDOList) {
BigDecimal id = subMapper.getMaxPmCmdLargePltId();
for (int i = 0 ; i < pmCmdLargePltDOList.size() ; i++){
pmCmdLargePltDOList.get(i).setPmCmdLargePltId(id.add(BigDecimal.valueOf(i+1)));
pmCmdLargePltDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmCmdLargePltDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmCmdLargePlt(pmCmdLargePltDOList.get(i));
}
}
@Override
public void batchInsertPmPdPlateCut(List<PmPdPlateCutDO> pmPdPlateCutDOList) {
BigDecimal id = subMapper.getMaxPmPdPlateCutId();
for (int i = 0 ; i < pmPdPlateCutDOList.size() ; i++){
pmPdPlateCutDOList.get(i).setCutId(id.add(BigDecimal.valueOf(i+1)));
pmPdPlateCutDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmPdPlateCutDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmPdPlateCut(pmPdPlateCutDOList.get(i));
}
}
@Override
public void batchInsertPmPdBlockPos(List<PmPdBlockPosDO> pmPdBlockPosDOList) {
BigDecimal id = subMapper.getMaxPmPdBlockPosId();
for (int i = 0 ; i < pmPdBlockPosDOList.size() ; i++){
pmPdBlockPosDOList.get(i).setPdBlockPosId(id.add(BigDecimal.valueOf(i+1)));
pmPdBlockPosDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmPdBlockPosDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmPdBlockPos(pmPdBlockPosDOList.get(i));
}
}
@Override
public void batchInsertPmPdContSum(List<PmPdContSumDO> pmPdContSumDOList) {
BigDecimal id = subMapper.getMaxPmPdContSumId();
for (int i = 0 ; i < pmPdContSumDOList.size() ; i++){
pmPdContSumDOList.get(i).setPpcsId(id.add(BigDecimal.valueOf(i+1)));
pmPdContSumDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmPdContSumDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmPdContSum(pmPdContSumDOList.get(i));
}
}
@Override
public void batchInsertPmSmallPltPos(List<PmSmallPltPosDO> pmSmallPltPosDOList) {
BigDecimal id = subMapper.getMaxPmSmallPltPosId();
for (int i = 0 ; i < pmSmallPltPosDOList.size() ; i++){
pmSmallPltPosDOList.get(i).setPsppId(id.add(BigDecimal.valueOf(i+1)));
pmSmallPltPosDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmSmallPltPosDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmSmallPltPos(pmSmallPltPosDOList.get(i));
}
}
@Override
public void batchInsertPmCmdSmallPlt(List<PmCmdSmallPltDO> pmCmdSmallPltDOList) {
BigDecimal id = subMapper.getMaxPmCmdSmallPltId();
for (int i = 0 ; i < pmCmdSmallPltDOList.size() ; i++){
pmCmdSmallPltDOList.get(i).setPmCmdSmallPltId(id.add(BigDecimal.valueOf(i+1)));
pmCmdSmallPltDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmCmdSmallPltDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmCmdSmallPlt(pmCmdSmallPltDOList.get(i));
}
}
@Override
public void batchInsertPmCmdCont(List<PmCmdContDO> pmCmdContDOList) {
BigDecimal id = subMapper.getMaxPmCmdContId();
for (int i = 0 ; i < pmCmdContDOList.size() ; i++){
pmCmdContDOList.get(i).setPmCmdContId(id.add(BigDecimal.valueOf(i+1)));
pmCmdContDOList.get(i).setTenantId(BigDecimal.valueOf(1));
pmCmdContDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
subMapper.insertPmCmdCont(pmCmdContDOList.get(i));
} }
subMapper.batchInsertPmCmdSlab(pmCmdSlabDOList);
} }

5
1024shop-manager/1024shop-manager/src/main/resources/logback.xml
Unescape Escape View File

@ -125,6 +125,11 @@
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />
<!-- MyBatis SQL 日志记录 -->
<logger name="net.xdclass.shopmanager.mapper" level="DEBUG" additivity="false">
<appender-ref ref="console"/>
</logger>
<root level="info"> <root level="info">
<appender-ref ref="console" /> <appender-ref ref="console" />
</root> </root>

1442
1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save