From 3d2098353abe8044073c40ac6f6f7d6b474349b2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 四月 2025 10:30:16 +0800
Subject: [PATCH] 库存字段优化 人工上架接口修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 8 ++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
index 47e8a1b..844c06b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
@@ -95,10 +95,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<StockItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(StockItem::getMatnrk, condition);
+ wrapper.like(StockItem::getMaktx, condition);
}
stockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getMatnrk()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getMaktx()))
);
return R.ok().add(vos);
}
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 b2f899c..0e1a978 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
@@ -86,7 +86,7 @@
* 鐗╂枡鏍囪瘑
*/
@ApiModelProperty(value= "鐗╂枡鏍囪瘑")
- private String matnrId;
+ private Long matnrId;
/**
* 鐗╂枡缂栫爜
@@ -233,7 +233,7 @@
public AsnOrderItem() {}
- public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.asnId = asnId;
this.asnCode = asnCode;
this.poDetlId = poDetlId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index d90bbe0..d256b0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -58,7 +58,7 @@
* 鐗╂枡缂栫爜
*/
@ApiModelProperty(value= "鐗╂枡缂栫爜")
- private String code;
+ private String matnrCode;
@ApiModelProperty(value = "閫氱煡鍗曟槑缁嗘爣璇�")
@@ -68,7 +68,7 @@
* 鍚嶇О
*/
@ApiModelProperty(value= "鍚嶇О")
- private String matnrk;
+ private String maktx;
/**
* 鏁伴噺
@@ -269,8 +269,8 @@
this.stockId = stockId;
this.matnrId = matnrId;
this.asnItemId = asnItemId;
- this.code = code;
- this.matnrk = matnrk;
+ this.matnrCode = code;
+ this.maktx = matnrk;
this.anfme = anfme;
this.workQty = workQty;
this.qty = qty;
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 3ea93c3..c270e68 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
@@ -129,7 +129,7 @@
.setPurUnit(item.getUnit())
.setMatnrCode(matnr.getCode())
.setMaktx(matnr.getName())
- .setMatnrId(matnr.getId() + "");
+ .setMatnrId(matnr.getId());
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index cc8f42a..e2c40cb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -108,7 +108,7 @@
.setUnit(item.getStockUnit())
.setFieldsIndex(item.getFieldsIndex())
.setUnit(item.getStockUnit())
- .setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
+ .setMatnrId(item.getMatnrId())
.setMaktx(item.getMaktx())
.setMatnrCode(item.getMatnrCode());
for (PakinItem waitPakinItem : waitPakin.getItems()) {
--
Gitblit v1.9.1