From 18cee3f153e61fb04b17701d63fbd51a9276122a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 09 五月 2025 19:04:01 +0800
Subject: [PATCH] 新增收货单打印预览界面
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 0b13b88..92480e9 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -21,6 +22,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;
@@ -29,6 +31,7 @@
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -61,6 +64,9 @@
@Autowired
private CompanysService companysService;
+
+ @Autowired
+ private DictDataService dictDataService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -114,6 +120,15 @@
if (Objects.isNull(date)) {
throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
}
+ if (Objects.isNull((OrderType.getTypeVal(template.getType())))) {
+ sbFaild.append(template.getCode()).append(",鍗曟嵁鐘舵�佷笉瀛樺湪锛侊紒");
+ throw new CoolException(sbFaild.toString());
+ }
+ if (Objects.isNull((OrderWorkType.getWorkType(template.getWkType())))) {
+ sbFaild.append(template.getCode()).append(",涓氬姟鐘舵�佷笉瀛樺湪锛侊紒");
+ throw new CoolException(sbFaild.toString());
+ }
+
order.setCode(template.getCode())
.setPoCode(template.getPoCode())
.setMemo(template.getMemo())
@@ -147,14 +162,15 @@
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()))
+ .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
// .setTrackCode(trackCode)
-// .setBarcode(trackCode)
+ .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -232,10 +248,21 @@
// }
//淇濆瓨鎵╁睍瀛楁
try {
- String uuid16 = CommonUtil.randomUUID16();
- Boolean fields = FieldsUtils.saveFields(params, uuid16);
- if (fields) {
+ if (Objects.isNull(asnOrderItem.getFieldsIndex()) || StringUtils.isBlank(asnOrderItem.getFieldsIndex())) {
+ StringBuffer sb = new StringBuffer();
+ if (!asnOrderItem.getExtendFields().isEmpty()) {
+ Map<String, String> fields = asnOrderItem.getExtendFields();
+ asnOrderItem.getExtendFields().keySet().forEach(key -> {
+ sb.append(fields.get(key));
+ });
+ }
+ sb.append(asnOrderItem.getAsnCode() + asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() + asnOrderItem.getIsptResult$());
+ //鑾峰彇16浣島uid
+ String uuid16 = Cools.md5Chinese(sb.toString());
asnOrderItem.setFieldsIndex(uuid16);
+ if (FieldsUtils.saveFields(params, uuid16)) {
+ asnOrderItem.setFieldsIndex(uuid16);
+ }
}
} catch (Exception e) {
throw new RuntimeException(e);
--
Gitblit v1.9.1