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 | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 insertions(+), 2 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 e1af652..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.*;
@@ -76,6 +78,24 @@
return mobileService.WarehouseOut(combParam,getHostId());
}
+ @RequestMapping("/pda/WarehouseOut/v1")
+ @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")
@ManagerAuth
public R menuPda(){
@@ -89,6 +109,45 @@
List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
List<Permission> permissions = permissionService.listByIds(collect);
return R.ok().add(permissions);
+ }
+
+ /**
+ * 鍏ュ簱鍒朵护妫�娴� -- 鎸囦护鍦ㄥ簱瀛橀噷闈㈠�熺敤鎵瑰彿瀛楁batch
+ * 1.鍙甯稿叆搴�
+ * 2.搴撳瓨鍖呭惈鐩稿悓鍒朵护璐х墿锛屾槸鍚﹁繘琛岃ˉ璐�
+ * 3.宸ヤ綔妗ｅ瓨鍦ㄦ鍦ㄥ叆搴撲换鍔★紝鎷掔粷鍏ュ簱
+ */
+ @RequestMapping("/pda/decrees/check")
+ @ManagerAuth
+ public R pdaDecreesCheck(@RequestParam String decrees){
+ if (Cools.isEmpty(decrees)) {
+ return R.error("鍒朵护涓嶈兘涓虹┖");
+ }
+ Long hostId = getHostId();
+ //鏌ヨ鏄惁鏈夊簱瀛�
+ List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getBatch, decrees));
+ //鏌ヨ鏄惁鏈夋鍦ㄥ伐浣滅殑宸ヤ綔妗�
+ List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getBatch, decrees));
+ HashMap<String, Object> map = new HashMap<>();
+ if(list.isEmpty() && wrkDetls.isEmpty()){
+ map.put("status", 1);//鍙甯稿叆搴�
+ } else if (!wrkDetls.isEmpty()) {
+ map.put("status", 3);//瀛樺湪宸ヤ綔妗ｏ紝鎷掔粷鍏ュ簱
+ } else {
+ //鑾峰彇搴撳瓨鏈�灏戠殑涓�鏉¤褰�
+ Double anfme = 999999999D;
+ LocDetl miniLocDetl = null;
+ for (LocDetl locDetl : list) {
+ if (locDetl.getAnfme() < anfme) {
+ anfme = locDetl.getAnfme();
+ miniLocDetl = locDetl;
+ }
+ }
+
+ map.put("status", 2);//搴撳瓨鍖呭惈鐩稿悓鍒朵护璐х墿锛屾槸鍚﹁繘琛岃ˉ璐�
+ map.put("data", miniLocDetl);//搴撳瓨淇℃伅
+ }
+ return R.ok().add(map);
}
/**
@@ -339,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());
@@ -381,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);
@@ -482,6 +541,7 @@
wrkDetl.setModiUser(getUserId());
wrkDetl.setHostId(getHostId());
wrkDetl.setWrkMastId(wrkMast.getId());
+ wrkDetl.setZpallet(wrkMast.getBarcode());
if (!wrkDetlService.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -505,4 +565,52 @@
return R.ok();
}
+ @RequestMapping("/barcode/list/all")
+ @ManagerAuth(memo = "骞舵澘鍏ュ簱閫斾腑鎷ｆ枡鍑哄簱鑾峰彇浠诲姟淇℃伅")
+ @Transactional
+ public R orderOutListOrder(@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, 104));
+ 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, 104)
+ );
+ 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