From 5e804c8e97fff19f04c73dbab416308f03fc8ad7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 三月 2025 17:08:48 +0800
Subject: [PATCH] #修改 1. 优化标准收货 2. 添加动态扩展字段功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 7 +++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java | 6 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 9 +++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 6 +-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 6 ++++++
6 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 6a5a632..b740cd0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -196,13 +196,9 @@
if (Objects.isNull(params.getAsnCode())) {
throw new CoolException("閫氱煡鍗曚笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(params.getBarcode())) {
- throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
-
AsnOrderItem asnOrderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(AsnOrderItem::getBarcode, params.getBarcode()));
+ .eq(!Objects.isNull(params.getBarcode()) ,AsnOrderItem::getBarcode, params.getBarcode()));
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 98dcfd3..02f32e6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -99,10 +99,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getName, condition);
+ wrapper.like(AsnOrder::getCode, condition);
}
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
return R.ok().add(vos);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index f9fa8da..bdf5076 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -109,8 +109,8 @@
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
+// @ApiModelProperty(value= "鍚嶇О")
+// private String name;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -165,7 +165,7 @@
public AsnOrder() {}
- public AsnOrder(String code,String poCode,Long poId,String type,String wkType,Double anfme,Double qty,String logisNo,Date arrTime,Short rleStatus,String name,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrder(String code,String poCode,Long poId,String type,String wkType,Double anfme,Double qty,String logisNo,Date arrTime,Short rleStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.poCode = poCode;
this.poId = poId;
@@ -176,7 +176,6 @@
this.logisNo = logisNo;
this.arrTime = arrTime;
this.rleStatus = rleStatus;
- this.name = name;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index bff59da..226114d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -44,6 +44,12 @@
private Long asnId;
/**
+ * 瀛楁绱㈠紩
+ */
+ @ApiModelProperty("瀛楁绱㈠紩")
+ private String fieldsIndex;
+
+ /**
* ASN鍗曞彿
*/
@ApiModelProperty(value= "ASN鍗曞彿")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
index 560b79d..fcd5089 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
@@ -50,6 +50,12 @@
private String platItemId;
/**
+ * 鍔ㄦ�佸瓧娈电储寮�
+ */
+ @ApiModelProperty("鍔ㄦ�佸瓧娈电储寮�")
+ private String fieldsIndex;
+
+ /**
* 鐗╂枡缂栫爜
*/
@ApiModelProperty(value= "鐗╂枡缂栫爜")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 1dee193..9ab4fb3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.config.SysStockProperties;
+import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
@@ -91,6 +92,7 @@
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<AsnOrderItem> orderItems = new ArrayList<>();
+ String uuid16 = CommonUtil.randomUUID16();
items.forEach(item -> {
AsnOrderItem orderItem = new AsnOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
@@ -103,6 +105,7 @@
.setAsnId(order.getId())
.setQty(item.getQty())
.setSplrName(item.getSplrName())
+ .setAsnCode(code)
.setSplrCode(item.getSplrCode())
.setMatnk(item.getMatnrName())
.setPoDetlId(item.getId())
@@ -112,6 +115,12 @@
.setPurUnit(item.getUnit())
.setMatnk(matnr.getName())
.setMatnrId(matnr.getId() + "");
+ //鍒ゆ柇PO鍗曟槸鍚﹀凡璁剧疆鍔ㄦ�佸瓧娈电储寮�
+ if (Objects.isNull(item.getFieldsIndex())) {
+ orderItem.setFieldsIndex(uuid16);
+ } else {
+ orderItem.setFieldsIndex(item.getFieldsIndex());
+ }
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
--
Gitblit v1.9.1