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 | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 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..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
@@ -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,8 @@
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;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -62,6 +66,9 @@
@Autowired
private CompanysService companysService;
+ @Autowired
+ private DictDataService dictDataService;
+
@Override
public R generateBarcode(List<Long> orders) {
if (Objects.isNull(orders) || orders.isEmpty()) {
@@ -90,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();
@@ -114,11 +118,21 @@
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())
.setArrTime(date)
.setUpdateBy(loginUserId)
+ .setLogisNo(template.getLogicNo())
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
@@ -147,14 +161,18 @@
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)
+ .setPlatOrderCode(orderTemplate.getPlatOrderCode())
+ .setPlatWorkCode(orderTemplate.getPlatWorkCode())
+ .setProjectCode(orderTemplate.getProjectCode())
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -211,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())
@@ -227,19 +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 {
- String uuid16 = CommonUtil.randomUUID16();
- Boolean fields = FieldsUtils.saveFields(params, uuid16);
- if (fields) {
+ StringBuffer sb = new StringBuffer();
+ if (Objects.isNull(asnOrderItem.getFieldsIndex()) || StringUtils.isBlank(asnOrderItem.getFieldsIndex())) {
+ sb.append(asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() );
+ //鑾峰彇16浣島uid
+ String uuid16 = Cools.md5Chinese(sb.toString());
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