From e2d78583e67190d1d281400cb2a7532fc4b0023d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 08 五月 2025 11:15:36 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index fcfa9da..20b6d63 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -21,6 +21,7 @@
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
+import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -100,7 +101,7 @@
StringBuffer sbFaild = new StringBuffer();
for (String key : listMap.keySet()) {
if (StringUtils.isBlank(key)) {
- throw new CoolException("鍗曞彿涓嶈兘鑳戒负绌猴紒锛�");
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
@@ -129,16 +130,16 @@
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
AsnOrderItem orderItem = new AsnOrderItem();
if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
- throw new CoolException(orderTemplate.getPoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException(orderTemplate.getCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
if (StringUtils.isBlank(orderTemplate.getAnfme())) {
- throw new CoolException(orderTemplate.getPoCode() + "锛氭暟閲忎笉鑳借兘涓虹┖锛侊紒");
+ throw new CoolException(orderTemplate.getCode() + "锛氭暟閲忎笉鑳戒负绌猴紒锛�");
}
if (StringUtils.isBlank(orderTemplate.getType())) {
- throw new CoolException(orderTemplate.getPoCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
+ throw new CoolException(orderTemplate.getCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
}
if (StringUtils.isBlank(orderTemplate.getWkType())) {
- throw new CoolException(orderTemplate.getPoCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
+ throw new CoolException(orderTemplate.getCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
@@ -153,7 +154,8 @@
.setSplrBatch(orderTemplate.getSplrBatch())
.setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setTrackCode(trackCode)
+ .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
+// .setTrackCode(trackCode)
.setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
@@ -212,10 +214,10 @@
public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
- if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
- asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
- }
+// if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
+// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
+// asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
+// }
if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getId, asnOrderItem.getSplrCode())
--
Gitblit v1.9.1