From dc60b3451a2984722c01a5991e5b904b8bd44f0d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:33 +0800
Subject: [PATCH] 组绑解绑
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 135 ++++++++++++++++++++++++++++++++------------
1 files changed, 98 insertions(+), 37 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 768ef85..20b6d63 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
@@ -9,21 +9,25 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.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.service.FieldsItemService;
@@ -35,7 +39,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -55,6 +59,9 @@
@Autowired
private AsnOrderItemService asnOrderItemService;
+
+ @Autowired
+ private CompanysService companysService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -81,7 +88,7 @@
@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("鐗╂枡瀵煎叆澶辫触锛侊紒");
@@ -91,19 +98,29 @@
}
List<AsnOrderTemplate> resultList = result.getList();
Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
+ StringBuffer sbFaild = new StringBuffer();
for (String key : listMap.keySet()) {
- AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
- AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
- if (Objects.isNull(asnOrder)) {
- continue;
+ if (StringUtils.isBlank(key)) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder order = new AsnOrder();
+ AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
+ if (!Objects.isNull(order)) {
+ sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
+ throw new CoolException(sbFaild.toString());
+ }
+ order = new AsnOrder();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
+ if (Objects.isNull(date)) {
+ throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
+ }
order.setCode(template.getCode())
.setPoCode(template.getPoCode())
.setMemo(template.getMemo())
+ .setArrTime(date)
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!asnOrderMapper.save(order)) {
@@ -112,47 +129,81 @@
List<AsnOrderItem> items = new ArrayList<>();
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
AsnOrderItem orderItem = new AsnOrderItem();
- Matnr matnr = null;
- if (!Objects.isNull(orderTemplate.getMatnrCode()) || StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
- matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
- .eq(Matnr::getCode, orderTemplate.getMatnrCode()));
+ if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
+ 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("鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException(sbFaild.toString());
+ }
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
orderItem.setAsnId(order.getId())
.setAsnCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
+ .setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
- .setSplrName(orderTemplate.getSplrName())
- .setBarcode(orderTemplate.getBarcode())
- .setTrackCode(orderTemplate.getTrackCode())
- .setSplrCode(orderTemplate.getSplrCode())
+ .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
+// .setTrackCode(trackCode)
+ .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
- .setMaktx(orderTemplate.getMaktx())
- .setMatnrCode(orderTemplate.getMatnrCode())
- .setPurUnit(orderTemplate.getPurUnit())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()));
- if (!Objects.isNull(matnr)) {
- orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
+ .setPurUnit(matnr.getUnit())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setSpec(matnr.getSpec())
+ .setModel(matnr.getModel())
+ .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::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
+ .eq(Companys::getCode, orderTemplate.getSplrCode()));
+ if (!Objects.isNull(companys)) {
+ orderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ } else {
+ 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 purQty = items.stream().mapToDouble(AsnOrderItem::getPurQty).sum();
- if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>().set(AsnOrder::getQty, qty).set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
+// 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()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
}
- return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+ return R.ok("瀵煎叆鎴愬姛锛�" + sbFaild.toString());
}
/**
* @param
+ * @param loginUserId
* @return
* @author Ryan
* @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
@@ -160,16 +211,27 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean fieldsSave(Map<String, Object> params) {
+ public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
- if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
- asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
- ;
+ 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())
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val));
+ if (!Objects.isNull(companys)) {
+ asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ }
}
if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
- throw new CoolException("璁″垝鏀惰揣鏁颁笉鑳戒负绌猴紒锛�");
+ throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
+// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) {
+// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�");
+// }
//淇濆瓨鎵╁睍瀛楁
try {
String uuid16 = CommonUtil.randomUUID16();
@@ -194,7 +256,6 @@
}
hsahMap.setRecords(FieldsUtils.getExtendFields(hsahMap.getRecords()));
return hsahMap;
-
}
}
--
Gitblit v1.9.1