From 061cff4dd6cba45d2ad6dba82e415d5d3ef53478 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 28 三月 2025 15:45:22 +0800
Subject: [PATCH] #修改 1.标准收货信息修改 2. ASN单据保存抛异常问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 10 +++++-----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 8 ++++----
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 2 +-
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 320bcdc..4495118 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -56,17 +56,17 @@
/**
* 鏍囧噯鎵爜鏀惰揣淇℃伅
- * @param barcode
+ * @param trackCode
* @return
*/
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- @GetMapping("/orders/{barcode}")
+ @GetMapping("/orders/{trackCode}")
@ApiOperation("鏍囧噯鎵爜鏀惰揣")
- public R getOrderBybarcode(@PathVariable String barcode) {
- if (StringUtils.isEmpty(barcode)) {
+ public R getOrderBybarcode(@PathVariable String trackCode) {
+ if (StringUtils.isEmpty(trackCode)) {
throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getOrderByCode(barcode);
+ return mobileService.getOrderByCode(trackCode);
}
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index a7174c7..67b0970 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -61,6 +61,9 @@
@ApiModelProperty("閲囪喘鏁伴噺")
private Double purQty;
+ @ApiModelProperty("瀹為檯閫佽揣鏁伴噺")
+ private Double anfme;
+
@ApiModelProperty("鏀惰揣鏁伴噺")
private Double receiptQty;
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 a00a0ec..1b32504 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
@@ -142,7 +142,7 @@
if (StringUtils.isEmpty(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getBarcode, barcode));
+ List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -166,7 +166,6 @@
if (Objects.isNull(params.getWhAreaId())) {
throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
}
-
WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
if (Objects.isNull(areasItem)) {
@@ -200,7 +199,7 @@
if (Objects.isNull(dto.getReceiptQty())) {
throw new CoolException("鏀惰揣鏁版嵁涓嶈兘涓虹┖锛侊紒");
}
- if (dto.getReceiptQty() < dto.getPurQty()) {
+ if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
}
@@ -389,7 +388,8 @@
.setMaktx(asnOrderItem.getMaktx())
.setBarcode(asnOrderItem.getBarcode())
.setPoCode(asnOrderItem.getPoCode())
- .setPurQty(asnOrderItem.getAnfme())
+ .setAnfme(asnOrderItem.getAnfme())
+ .setPurQty(asnOrderItem.getPurQty())
.setSplrBatch(asnOrderItem.getSplrBatch());
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index da01e74..08b5f70 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,7 +22,7 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_wait_pakin_item";
+ generator.table="man_asn_order_log";
generator.tableDesc="缁勬嫋妗ｆ槑缁�";
generator.packagePath="com.vincent.rsf.server.manager";
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index ca6d9a9..7445b5c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -130,7 +130,7 @@
if (Objects.isNull(params.getOrders().getId())) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
}
- if (this.updateById(params.getOrders())) {
+ if (!this.updateById(params.getOrders())) {
throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
@@ -138,7 +138,7 @@
}
List<Map<String, Object>> items = params.getItems();
List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
- if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
+ if (!asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
}
return R.ok("淇敼瀹屾垚锛侊紒");
--
Gitblit v1.9.1