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

bug修改

Browse Source
This commit is contained in:
lym
2025-03-04 15:31:55 +08:00
parent 434a8bc8b7
commit 2d9db3f370
19 changed files with 131 additions and 41 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/dal/dataobject/order/OrderDO.java
+4 -4
View File
@@ -107,10 +107,10 @@ public class OrderDO extends BaseDO {
* 备注
*/
private String remark;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
/**
* 自定义板编号配置id
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java
+4 -4
View File
@@ -78,8 +78,8 @@ public class OrderBodyDO extends BaseDO {
* 备注
*/
private String remark;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java
+4 -4
View File
@@ -79,9 +79,9 @@ public class OrderGroupDO extends BaseDO {
* 备注
*/
private String remark;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java
+4 -4
View File
@@ -102,9 +102,9 @@ public class OrderPartsDO extends BaseDO {
* 备注
*/
private String remark;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java
+4 -4
View File
@@ -185,10 +185,10 @@ public class PlateDO extends BaseDO {
* 是否作废
*/
private Boolean isCancel;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
private String customPlateNo;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java
+4 -4
View File
@@ -57,9 +57,9 @@ public class OrderProcessDO extends BaseDO {
* 下一工序 ID
*/
private Long nextStepId;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java
+4 -4
View File
@@ -90,9 +90,9 @@ public class ProcessStepDO extends BaseDO {
* 工序处理日期
*/
private LocalDateTime processDate;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java
+4 -4
View File
@@ -71,9 +71,9 @@ public class RawGoodsDO extends BaseDO {
* 规格
*/
private String spec;
/**
* 是否删除
*/
private Boolean deleted;
// /**
// * 是否删除
// */
// private Boolean deleted;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+15 -1
View File
@@ -822,7 +822,21 @@ public class OrderServiceImpl implements OrderService {
} else if (plateGoodDOS != null && !plateGoodDOS.isEmpty()) { // 存在板材
goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId());
} else { // 不存在板材
throw exception(ORDER_MATCH_NOT);
// throw exception(ORDER_MATCH_NOT);
long plateNo = idWorker.nextId();
long obtainingTime = idWorker.obtainingTime();
String goodsId = goodsDO.getGoodsId() == null ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId();
goodsDO.setGoodsId(goodsId);
Long plateGoods = (Long) identifierGenerator.nextId(null);
plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class)
.setId(plateGoods)
.setGoodsId(goodsId);
plateGoodLists.add(plateGoodDO);
}
}