From f2833c7f3e01c997e94a66bd5dd9be738b5c6cc7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 13:31:08 +0800
Subject: [PATCH] 波次任务下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 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 92480e9..d6660b4 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
@@ -31,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.entity.Fields;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
@@ -96,9 +97,6 @@
public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
- throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
- }
- if (result.getList().isEmpty()) {
throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
List<AsnOrderTemplate> resultList = result.getList();
@@ -134,6 +132,7 @@
.setMemo(template.getMemo())
.setArrTime(date)
.setUpdateBy(loginUserId)
+ .setLogisNo(template.getLogicNo())
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
@@ -171,6 +170,9 @@
.setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
// .setTrackCode(trackCode)
.setBarcode(trackCode)
+ .setPlatOrderCode(orderTemplate.getPlatOrderCode())
+ .setPlatWorkCode(orderTemplate.getPlatWorkCode())
+ .setProjectCode(orderTemplate.getProjectCode())
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -227,11 +229,6 @@
@Transactional(rollbackFor = Exception.class)
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.isNoneBlank(asnOrderItem.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getId, asnOrderItem.getSplrCode())
@@ -243,30 +240,22 @@
if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
-// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) {
-// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�");
-// }
//淇濆瓨鎵╁睍瀛楁
try {
+ StringBuffer sb = new StringBuffer();
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$());
+ sb.append(asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() );
//鑾峰彇16浣島uid
String uuid16 = Cools.md5Chinese(sb.toString());
asnOrderItem.setFieldsIndex(uuid16);
- if (FieldsUtils.saveFields(params, uuid16)) {
- asnOrderItem.setFieldsIndex(uuid16);
- }
+ params.put("index", uuid16);
}
+ //淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
+ FieldsUtils.updateFieldsValue(params);
} catch (Exception e) {
throw new RuntimeException(e);
}
+ asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
--
Gitblit v1.9.1