From 9e29f3bb65e23d6b7df50f1bc0684fc32db04121 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 17:10:47 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 2 ++
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 | 41 +++++++++++++++++++++++++++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InspectDetlDto.java | 2 ++
4 files changed, 46 insertions(+), 9 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 433b450..df6eb98 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
@@ -132,7 +132,6 @@
return mobileService.getDeltByCode(code);
}
-
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬嫋")
@PostMapping("/waitPakin/merge")
@@ -175,4 +174,13 @@
return mobileService.inspect(code, getLoginUserId());
}
+ @ApiOperation("鎻愪氦鎶ユ")
+ @GetMapping("/inspect/confirm/{id}")
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ public R confirmInspect(@PathVariable String id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ return mobileService.confirmIspt(id);
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InspectDetlDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InspectDetlDto.java
index 6637d98..bd1f5ad 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InspectDetlDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InspectDetlDto.java
@@ -14,6 +14,8 @@
public class InspectDetlDto {
@ApiModelProperty("鍗曞彿")
private String code;
+ @ApiModelProperty("鍗曞彿ID")
+ private Long id;
@ApiModelProperty("PO鍗曞彿")
private String poCode;
@ApiModelProperty("鏄庣粏")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 2b3058d..2227389 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -42,4 +42,6 @@
WaitPakin unBind(WaitPakinParam param);
R inspect(String code, Long loginUserId);
+
+ R confirmIspt(String id);
}
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 f970056..41976a5 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
@@ -72,8 +72,8 @@
private WarehouseAreasService warehouseAreasService;
@Resource
private AsnOrderItemMapper asnOrderItemMapper;
- @Resource
- private AsnOrderMapper asnOrderMapper;
+ @Autowired
+ private AsnOrderService asnOrderMapper;
@Resource
private MatnrMapper matnrMapper;
@Resource
@@ -192,14 +192,14 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>()
+ AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
.eq(AsnOrder::getCode, asnCode));
if (Objects.isNull(asnOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
asnOrder.setQty(receiptQty);
- if (asnOrderMapper.updateById(asnOrder) < 1) {
+ if (!asnOrderMapper.updateById(asnOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
@@ -312,7 +312,7 @@
* @time 2025/3/19 19:53
*/
private void operateOrderLogs(AsnOrder asnOrder) {
- if (asnOrderMapper.deleteById(asnOrder.getId()) < 1) {
+ if (!asnOrderMapper.removeById(asnOrder.getId())) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
@@ -374,7 +374,7 @@
*/
@Override
public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.selectList(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_PURCHASE_IN.type));
+ List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_PURCHASE_IN.type));
return asnOrders;
}
@@ -432,12 +432,12 @@
*/
@Override
public R inspect(String code, Long loginUserId) {
- AsnOrder asnOrders = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
+ AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
if (Objects.isNull(asnOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
InspectDetlDto detlDto = new InspectDetlDto();
- detlDto.setCode(asnOrders.getCode()).setPoCode(asnOrders.getPoCode());
+ detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode());
List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
@@ -466,6 +466,31 @@
}
/**
+ * @author Ryan
+ * @description 鎻愪氦鎶ユ
+ * @param
+ * @return
+ * @time 2025/4/1 16:47
+ */
+ @Override
+ public R confirmIspt(String id) {
+ if (org.apache.commons.lang3.StringUtils.isBlank(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ AsnOrder asnOrder = asnOrderMapper.getById(id);
+ if (Objects.isNull(asnOrder)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ List<AsnOrder> orders = new ArrayList<>();
+ orders.add(asnOrder);
+ if (asnOrderMapper.notifyInspect(orders)) {
+ return R.ok("涓婃姤鎴愬姛锛侊紒");
+ }else {
+ return R.error("涓婃姤澶辫触锛侊紒");
+ }
+ }
+
+ /**
* 鑾峰彇ReceiptDetlsDtos
*/
private R getAsnOrderItem(List<AsnOrderItem> items) {
--
Gitblit v1.9.1