From cc3185eaf94050d299cbd9d0c105eb3d1229996a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 16:10:04 +0800
Subject: [PATCH] 修復
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index bf35464..1251aed 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -10,6 +10,8 @@
import com.zy.asrs.common.domain.param.PickConfirmParam;
import com.zy.asrs.common.domain.param.PickMatParam;
import com.zy.asrs.common.openapi.entity.param.CombParam;
+import com.zy.asrs.common.openapi.entity.param.WarehouseOutMergeBoardManyParam;
+import com.zy.asrs.common.openapi.entity.param.WarehouseOutPickMergeParam;
import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.*;
@@ -80,6 +82,18 @@
@ManagerAuth
public R WarehouseOutV1(@RequestBody CombParam combParam){
return mobileService.WarehouseOutV1(combParam,getHostId());
+ }
+
+ @RequestMapping("/pda/WarehouseOutPickMerge/v1")
+ @ManagerAuth
+ public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param){
+ return mobileService.WarehouseOutPickMergeV1(param, getHostId());
+ }
+
+ @RequestMapping("/pda/WarehouseOutMergeBoardMany/v1")
+ @ManagerAuth
+ public R WarehouseOutMergeBoardManyV1(@RequestBody WarehouseOutMergeBoardManyParam param){
+ return mobileService.WarehouseOutMergeBoardMany(param, getHostId());
}
@RequestMapping("/menu/pda/auth")
@@ -384,7 +398,7 @@
@RequestMapping("/pick/mat/list")
@ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
public R pickMats(@RequestParam(required = false) String matnr){
- List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getDocName, "鍏ュ簱"));
+ List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakin, 1));
ArrayList<Long> typeList = new ArrayList<>();
for (DocType docType : docTypes) {
typeList.add(docType.getDocId());
@@ -426,7 +440,7 @@
matParam.setOrderNo(orderDetl.getOrderNo());
matParam.setOrderId(orderDetl.getOrderId());
matParam.setCount(count);
- matParam.setUseCount(0D);
+ matParam.setUseCount(count);
maps.add(matParam);
}
return R.ok().add(maps);
@@ -527,6 +541,7 @@
wrkDetl.setModiUser(getUserId());
wrkDetl.setHostId(getHostId());
wrkDetl.setWrkMastId(wrkMast.getId());
+ wrkDetl.setZpallet(wrkMast.getBarcode());
if (!wrkDetlService.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -558,19 +573,41 @@
if (Cools.isEmpty(barcode) || barcode.isEmpty()){
List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
.eq(WrkMast::getHostId, getHostId())
- .eq(WrkMast::getWrkSts, 199)
+ .eq(WrkMast::getWrkSts, 199L)
.eq(WrkMast::getIoType, 104));
wrkMastArrayList.addAll(wrkMasts);
} else {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>()
- .eq(WrkMast::getBarcode, barcode)
+ List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
+ .like(WrkMast::getBarcode, barcode)
.eq(WrkMast::getHostId, getHostId())
- .eq(WrkMast::getWrkSts, 199)
+ .eq(WrkMast::getWrkSts, 199L)
.eq(WrkMast::getIoType, 104)
);
- if (!Cools.isEmpty(wrkMast)){
- wrkMastArrayList.add(wrkMast);
- }
+ wrkMastArrayList.addAll(wrkMasts);
+ }
+
+ return R.ok().add(wrkMastArrayList);
+ }
+
+ @RequestMapping("/barcode/list/pick")
+ @ManagerAuth(memo = "鎷ｆ枡鍏ュ簱閫斾腑骞舵澘")
+ @Transactional
+ public R orderOutListOrderPick(@RequestBody String barcode) {
+ ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
+ if (Cools.isEmpty(barcode) || barcode.isEmpty()){
+ List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
+ .eq(WrkMast::getHostId, getHostId())
+ .eq(WrkMast::getWrkSts, 199L)
+ .eq(WrkMast::getIoType, 103));
+ wrkMastArrayList.addAll(wrkMasts);
+ } else {
+ List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
+ .like(WrkMast::getBarcode, barcode)
+ .eq(WrkMast::getHostId, getHostId())
+ .eq(WrkMast::getWrkSts, 199L)
+ .eq(WrkMast::getIoType, 103)
+ );
+ wrkMastArrayList.addAll(wrkMasts);
}
return R.ok().add(wrkMastArrayList);
--
Gitblit v1.9.1