From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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/api/controller/pda/MobileController.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index fd824b7..5ef37c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -1,11 +1,16 @@
package com.vincent.rsf.server.api.controller.pda;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
+import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
@@ -34,6 +39,10 @@
@Autowired
private MobileService mobileService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private WaitPakinService waitPakinService;
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -138,7 +147,11 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getItemByContainer(params);
+ if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
+ return mobileService.getUnItemByContainer(params);
+ } else {
+ return mobileService.getItemByContainer(params);
+ }
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -159,23 +172,6 @@
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("鐗╂枡缁勬墭")
- @PostMapping("/waitPakin/matnr/merge")
- public R pikinMatnrOrder(@RequestBody WaitPakinParam waitPakin) {
- Long userId = getLoginUserId();
- if (Objects.isNull(waitPakin)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(mobileService.mergeMatnrItems(waitPakin, userId));
- }
-
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬嫋瑙ｇ粦")
@PostMapping("/waitPakin/unbind")
public R pakinUnBind(@RequestBody WaitPakinParam param) {
@@ -186,7 +182,7 @@
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ return R.error("瑙ｇ粦鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
return R.ok(mobileService.unBind(param));
}
@@ -213,7 +209,7 @@
@ApiOperation("蹇�熻川妫�淇℃伅")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- @PostMapping("/inspect/query")
+// @PostMapping("/inspect/query")
public R checkObjs(@RequestBody CheckObjParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -229,7 +225,7 @@
if (Objects.isNull(params) || params.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.checkUpdate(params);
+ return mobileService.checkUpdate(params, getLoginUserId());
}
@ApiOperation("鑾峰彇涓婃灦淇℃伅")
@@ -245,11 +241,15 @@
@ApiOperation("浜哄伐涓婃灦")
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
@PostMapping("/stock/operate")
- public R publicToStock(@RequestBody PublicToStockParams params) {
- if (Objects.isNull(params)) {
+ public R publicToStock(@RequestBody ManualShelvingParams params) {
+ if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode()) || Cools.isEmpty(params.getBarcode())) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.publicToStock(params, getLoginUserId());
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));
+
+
+ return taskService.generateFlatWarehouseTasks(waitPakin, params.getLocCode(), getLoginUserId());
+// return mobileService.publicToStock(params, getLoginUserId());
}
@ApiOperation("鑾峰彇浠诲姟淇℃伅")
--
Gitblit v1.9.1