From d79db0da7de1c22e6803a45144ccdd9c931fbbc1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 08:58:37 +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/system/utils/ExtendFieldsUtils.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 11 ++++++++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 18 +++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 8 +++-----
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 0769ded..385b535 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -114,7 +114,7 @@
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勭洏")
+ @ApiOperation("缁勬嫋")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
if (Objects.isNull(waitPakin)) {
@@ -129,5 +129,21 @@
return R.ok(waitPakinService.mergeItems(waitPakin));
}
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("缁勬嫋瑙ｇ粦")
+ @PostMapping("/waitPakin/unbind")
+ public R pakinUnBind(@RequestBody WaitPakinParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (StringUtils.isBlank(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
+ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ return R.ok(waitPakinService);
+
+ }
}
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 917d504..d58f4c2 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
@@ -103,15 +103,20 @@
@Override
public boolean fieldsSave(Map<String, Object> params) {
- //淇濆瓨鎵╁睍瀛楁
- ExtendFieldsUtils.saveFields(params);
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
- SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params);
+ params.put("trackCode", ruleCode);
}
if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
+ //淇濆瓨鎵╁睍瀛楁
+ try {
+ ExtendFieldsUtils.saveFields(params);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
return true;
}
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 7445b5c..1e7709d 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
@@ -44,10 +44,8 @@
private ReportMsgService reportMsgService;
@Resource
private PurchaseMapper purchaseMapper;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Resource
private SerialRuleMapper serialRuleMapper;
@@ -67,7 +65,6 @@
return false;
}
}
-
@Override
public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -92,7 +89,9 @@
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
AsnOrder orders = params.getOrders();
-
+ if (Objects.isNull(orders)) {
+ throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
if (Objects.isNull(ruleCode)) {
throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�");
@@ -111,7 +110,6 @@
if (!asnOrderItemService.fieldsSave(item)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
-
});
return R.ok("淇濆瓨鎴愬姛!!");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
index 8972eff..0ff555f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
@@ -28,7 +28,7 @@
* @return
* @time 2025/3/15 13:36
*/
- public static Boolean saveFields(Map<String, Object> params) {
+ public static Boolean saveFields(Map<String, Object> params) throws Exception{
FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>()
.eq(Fields::getStatus, 1)
--
Gitblit v1.9.1