From 4153937c91df7fcf6d7f70d95f6f8e03643b975d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 15:48:16 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 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 b7775b2..32a81f3 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
@@ -4,22 +4,30 @@
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.common.utils.CommonUtil;
+import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
+import com.vincent.rsf.server.api.service.ReportMsgService;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
-import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
+import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.entity.FieldsItem;
+import com.vincent.rsf.server.manager.service.PurchaseService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.utils.ExtendFieldsUtils;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,8 +35,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.IOException;
import java.util.*;
+import java.util.stream.Collectors;
@Service("asnOrderItemService")
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
@@ -38,13 +46,37 @@
@Autowired
private FieldsService fieldsService;
+
@Autowired
private FieldsItemService fieldsItemService;
@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));
+ if (items.isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ items.forEach(item -> {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("绯荤粺閿欒锛岃妫�鏌ャ�孲YS_LABEL_CODE銆嶆爣绛捐鍒欐槸鍚﹀瓨鍦�");
+ }
+ item.setTrackCode(ruleCode);
+ });
+ if (!this.saveOrUpdateBatch(items)) {
+ throw new CoolException("鐢熸垚鏉＄爜澶辫触锛侊紒");
+ }
+
+ return R.ok();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception {
- ExcelImportResult<AsnOrderTemplate> result = ExcelImportUtil.importExcelMore(file.getInputStream(), MatnrsTemplate.class, ExcelUtil.getDefaultImportParams());
+ ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
@@ -71,28 +103,31 @@
@Override
public boolean fieldsSave(Map<String, Object> params) {
- List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
- List<FieldsItem> fieldsItems = new ArrayList<>();
- if (!fields.isEmpty()) {
- String uuid16 = CommonUtil.randomUUID16();
- for (Fields obj : fields) {
- if (!Objects.isNull(params.get(obj.getFields()))) {
- FieldsItem item = new FieldsItem();
- item.setUuid(uuid16)
- .setValue(params.get(obj.getFields()).toString())
- .setMatnrId(Long.parseLong(params.get("matnrId").toString()))
- .setFieldsId(obj.getId());
- fieldsItems.add(item);
- }
- }
- if (!fieldsItemService.saveBatch(fieldsItems)) {
- throw new CoolException("鍗曟嵁鏄庣粏鎵╁睍瀛楁淇濆瓨澶辫触锛侊紒");
- }
- }
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
- if (!this.save(asnOrderItem)) {
+ if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
+ asnOrderItem.setTrackCode(ruleCode);
+ }
+ if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
+ //淇濆瓨鎵╁睍瀛楁
+ try {
+ ExtendFieldsUtils.saveFields(params);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
return true;
}
+
+ @Override
+ public IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper) {
+ IPage<Map<String, Object>> hsahMap = this.baseMapper.resultForMap(pageParam, buildWrapper);
+ if (hsahMap.getRecords().isEmpty()) {
+ return hsahMap.setRecords(new ArrayList<>());
+ }
+ hsahMap.setRecords(ExtendFieldsUtils.getExtendFields(hsahMap.getRecords()));
+ return hsahMap;
+
+ }
}
--
Gitblit v1.9.1