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

数值长度限制提示

Browse Source
This commit is contained in:
lym
2025-02-21 16:35:54 +08:00
parent 17971a98dd
commit f03117fe4d
3 changed files with 16 additions and 39 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/service/order/OrderServiceImpl.java
+9 -31
View File
@@ -808,43 +808,21 @@ public class OrderServiceImpl implements OrderService {
return Collections.emptyMap();
}
for (GoodsDO goodsDO : goodsLists) {
PlateGoodDO plateGoodDO = null; // plate
List<PlateGoodDO> plateGoodDOS = null; // plate list
if (goodsDO.getGoodsId() != null && !goodsDO.getGoodsId().isEmpty()) { // 有goodsId
PlateGoodDO plateGoodDO = null;
if (goodsDO.getGoodsId() != null && !goodsDO.getGoodsId().isEmpty()) { // 有goodsId，匹配goodsId
plateGoodDO = getPlateGood(goodsDO.getGoodsId(), OrganContextHolder.getOrganId());
} else { // 没有goodsId 其他信息匹配
// plateGoodDOS = plateGoodMapper.selectGood(goodsDO.getGoodsName(), goodsDO.getMaterial(), goodsDO.getColor(),
// goodsDO.getTexture(), goodsDO.getWidth(), goodsDO.getThickness(), goodsDO.getHeight(), goodsDO.getBrand(),
// goodsDO.getSpec(), OrganContextHolder.getOrganId());
plateGoodDOS = plateGoodMapper.selectGood(goodsDO.getMaterial(), goodsDO.getColor(), goodsDO.getThickness(),
goodsDO.getBrand(),goodsDO.getGoodsName(), OrganContextHolder.getOrganId());
}
if (plateGoodDOS != null && !plateGoodDOS.isEmpty()) {//存在板材
goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId());
} else if (plateGoodDO != null) { // 存在板材
// 直接匹配字段
List<PlateGoodDO> plateGoodDOS = plateGoodMapper.selectGood(goodsDO.getMaterial(), goodsDO.getColor(), goodsDO.getThickness(),
goodsDO.getBrand(),goodsDO.getGoodsName(), OrganContextHolder.getOrganId());
if (plateGoodDO != null) {//存在板材
goodsDO.setGoodsId(plateGoodDO.getGoodsId());
} else if (plateGoodDOS != null && !plateGoodDOS.isEmpty()) { // 存在板材
goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId());
} else { // 不存在板材
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);
}
}