From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 52 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 9ab4f72..4dc8371 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,27 +7,31 @@
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.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.Companys;
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
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;
@@ -37,11 +41,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service("asnOrderItemService")
-public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
+public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {
@Autowired
private AsnOrderService asnOrderMapper;
@@ -60,12 +65,15 @@
@Autowired
private CompanysService companysService;
+ @Autowired
+ private DictDataService dictDataService;
+
@Override
public R generateBarcode(List<Long> orders) {
if (Objects.isNull(orders) || orders.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> items = this.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, orders));
+ List<WkOrderItem> items = this.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, orders));
if (items.isEmpty()) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -85,11 +93,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
+ 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("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
@@ -97,83 +102,118 @@
Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
StringBuffer sbFaild = new StringBuffer();
for (String key : listMap.keySet()) {
+ if (StringUtils.isBlank(key)) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
+ }
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
- continue;
+ throw new CoolException(sbFaild.toString());
}
- order = new AsnOrder();
+ order = new WkOrder();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
+ 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)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!asnOrderMapper.save(order)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
- continue;
+ throw new CoolException(orderTemplate.getCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
+ if (StringUtils.isBlank(orderTemplate.getAnfme())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氭暟閲忎笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getType())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getWkType())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
.eq(Matnr::getCode, orderTemplate.getMatnrCode()));
if (Objects.isNull(matnr)) {
sbFaild.append(orderTemplate.getMatnrCode()).append("鐗╂枡涓嶅瓨鍦�");
- continue;
+ throw new CoolException(sbFaild.toString());
}
- orderItem.setAsnId(order.getId())
- .setAsnCode(order.getCode())
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
+ orderItem.setOrderId(order.getId())
+ .setOrderCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
+ .setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
- .setBarcode(orderTemplate.getBarcode())
- .setTrackCode(orderTemplate.getTrackCode())
+ .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
+// .setTrackCode(trackCode)
+ .setBarcode(trackCode)
+ .setPlatOrderCode(orderTemplate.getPlatOrderCode())
+ .setPlatWorkCode(orderTemplate.getPlatWorkCode())
+ .setProjectCode(orderTemplate.getProjectCode())
.setPoCode(orderTemplate.getPoCode())
- .setPurUnit(orderTemplate.getPurUnit())
+ .setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setSpec(matnr.getSpec())
.setModel(matnr.getModel())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()))
.setMaktx(matnr.getName())
.setMatnrCode(matnr.getCode())
.setMatnrId(matnr.getId())
.setStockUnit(matnr.getUnit());
if (!Objects.isNull(orderTemplate.getSplrCode())) {
- Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderTemplate.getSplrCode()));
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
+ .eq(Companys::getCode, orderTemplate.getSplrCode()));
if (!Objects.isNull(companys)) {
orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
} else {
- orderItem.setSplrCode(orderTemplate.getSplrCode()).setSplrName(orderTemplate.getSplrName() + "(渚涘簲鍟嗕笉瀛樺湪锛侊紒)");
+ sbFaild.append("渚涘簲鍟�:" + orderTemplate.getSplrCode()).append("涓嶅瓨鍦�");
+ throw new CoolException(sbFaild.toString());
}
} else {
continue;
}
-
items.add(orderItem);
- if (!asnOrderItemService.saveBatch(items)) {
+
+ if (!asnOrderItemService.save(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
if (!items.isEmpty()) {
- double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
- double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
- if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getQty, qty)
- .set(AsnOrder::getAnfme, anfme)
- .eq(AsnOrder::getId, order.getId()))) {
+// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
+ double anfme = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
+// .set(AsnOrder::getQty, qty)
+ .set(WkOrder::getAnfme, anfme)
+ .eq(WkOrder::getId, order.getId()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
}
- return R.ok("鎿嶄綔鎴愬姛," + sbFaild.toString());
+ return R.ok("瀵煎叆鎴愬姛锛�" + sbFaild.toString());
}
/**
@@ -187,36 +227,57 @@
@Override
@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);
+ WkOrderItem wkOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), WkOrderItem.class);
+ if (StringUtils.isNoneBlank(wkOrderItem.getSplrCode())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getId, wkOrderItem.getSplrCode())
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val));
+ if (!Objects.isNull(companys)) {
+ wkOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ }
}
- if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
+ if (Objects.isNull(wkOrderItem.getAnfme()) || Double.compare(wkOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
-// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) {
-// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�");
-// }
+
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, wkOrderItem.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鏁版嵁閿欒锛氱墿鏂�" + wkOrderItem.getMatnrCode() + "涓嶅瓨鍦紒锛�");
+ }
+ wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
+
//淇濆瓨鎵╁睍瀛楁
try {
- String uuid16 = CommonUtil.randomUUID16();
- Boolean fields = FieldsUtils.saveFields(params, uuid16);
- if (fields) {
- asnOrderItem.setFieldsIndex(uuid16);
+ StringBuffer sb = new StringBuffer();
+ if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
+ List<Fields> fields = FieldsUtils.getFieldsSta();
+ for (Fields field : fields) {
+ if (Objects.isNull(params.get(field.getFields()))) {
+ continue;
+ }
+ //瀛楁鎷兼帴
+ sb.append(params.get(field.getFields()));
+ }
+ sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
+ //鑾峰彇16浣島uid
+ String uuid16 = Cools.md5Chinese(sb.toString());
+ wkOrderItem.setFieldsIndex(uuid16);
+ params.put("index", uuid16);
}
+ //淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
+ FieldsUtils.updateFieldsValue(params);
} catch (Exception e) {
throw new RuntimeException(e);
}
- if (!this.saveOrUpdate(asnOrderItem)) {
+ wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
+ if (!this.saveOrUpdate(wkOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
return true;
}
@Override
- public IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper) {
+ public IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper) {
IPage<Map<String, Object>> hsahMap = this.baseMapper.resultForMap(pageParam, buildWrapper);
if (hsahMap.getRecords().isEmpty()) {
return hsahMap.setRecords(new ArrayList<>());
--
Gitblit v1.9.1