Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道Bug968，820，665修改

Browse Source
This commit is contained in:
liuzhaotian
2024-12-17 10:39:05 +08:00
parent f3dc019a48
commit f49df6a5b7
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/SavePlanPlateResultReqVO.java
-2
View File
@@ -12,8 +12,6 @@ import java.util.List;
public class SavePlanPlateResultReqVO {
@Schema(description = "优化后的大板列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "优化数据异常，请重新进行优化")
private List<OptimizeBoardModelDO> optimizeBoardModelDOS;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+7 -2
View File
@@ -350,7 +350,12 @@ public class PlateServiceImpl implements PlateService {
PlateDO plateDO = BeanUtils.toBean(reqVO, PlateDO.class);
plateDO.setRemark(reqVO.getRemake1() +","+ reqVO.getRemake2());
String remake1 = reqVO.getRemake1() == null ? "" : reqVO.getRemake1() + ";" ;
String remake2 = reqVO.getRemake2() == null ? "" : reqVO.getRemake2();
plateDO.setRemark(remake1+remake2);
plateDO.setHoleArrange(reqVO.getPlaceHole());
plateDO.setGoodsId(goodsDO.getId());
plateDO.setThickness(goodsDO.getThickness());
@@ -358,7 +363,7 @@ public class PlateServiceImpl implements PlateService {
plateDO.setPlateNo((obtainingTime) + Long.toString(plateNo).substring(2));
plateDO.setType(OrderPlateTypeEnum.SELFINCREASINGBOARD.getType());
plateDO.setArea(reqVO.getWidth().multiply(reqVO.getHeight()).movePointLeft(4).stripTrailingZeros());
plateDO.setArea(reqVO.getWidth().multiply(reqVO.getHeight()).movePointLeft(6).stripTrailingZeros());
plateDOS.add(plateDO);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
+4 -3
View File
@@ -102,9 +102,10 @@ public class LabelServiceImpl implements LabelService {
packageConfigDOS.forEach(f -> {
JsonNode packConfig = parseTree(unzipString(f.getSetting()));
labelId.add(packConfig.get("partLabelId").asLong());
labelId.add(packConfig.get("orderLabelId").asLong());
labelId.add(packConfig.get("plateLabelId").asLong());
labelId.add(packConfig.get("partLabelId") == null ? null : packConfig.get("partLabelId").asLong());
labelId.add(packConfig.get("orderLabelId") == null ? null : packConfig.get("orderLabelId").asLong());
labelId.add(packConfig.get("plateLabelId") == null ? null : packConfig.get("plateLabelId").asLong());
});