From ce0f9490376709fdd96ce6b864bd105ac64f086c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 17:14:38 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 26 +++++++++++++-------------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 7 ++++---
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 391d354..86f79f9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -318,7 +318,7 @@
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
- .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
+// .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
.setAnfme(dto.getReceiptQty())
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
@@ -331,8 +331,9 @@
.setShipperId(matnr.getShipperId());
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
- .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
+// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+ .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
+ .eq(WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
.eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
if (!Objects.isNull(serviceOne)) {
item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
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..0b13b88 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
@@ -100,7 +100,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 +129,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>()
@@ -147,14 +147,14 @@
sbFaild.append(orderTemplate.getMatnrCode()).append("鐗╂枡涓嶅瓨鍦�");
throw new CoolException(sbFaild.toString());
}
- String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
+// String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
orderItem.setAsnId(order.getId())
.setAsnCode(order.getCode())
- .setSplrBatch(orderTemplate.getSplrBatch())
+// .setSplrBatch(orderTemplate.getSplrBatch())
.setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setTrackCode(trackCode)
- .setBarcode(trackCode)
+// .setTrackCode(trackCode)
+// .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -212,10 +212,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