From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 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 a9c372d..978ce8d 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
@@ -70,6 +70,12 @@
return mobileService.WarehouseIn(locNo,barcode,getHostId());
}
+ @RequestMapping("/pda/WarehouseOut")
+ @ManagerAuth
+ public R WarehouseOut(@RequestBody CombParam combParam){
+ return mobileService.WarehouseOut(combParam,getHostId());
+ }
+
@RequestMapping("/menu/pda/auth")
@ManagerAuth
public R menuPda(){
@@ -83,6 +89,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);
}
/**
@@ -375,6 +420,7 @@
matParam.setOrderNo(orderDetl.getOrderNo());
matParam.setOrderId(orderDetl.getOrderId());
matParam.setCount(count);
+ matParam.setUseCount(0D);
maps.add(matParam);
}
return R.ok().add(maps);
@@ -480,7 +526,7 @@
}
//鏇存柊璁㈠崟宸ヤ綔鏁伴噺
- orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount());
+ orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId());
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));
--
Gitblit v1.9.1