From a1dd6ff24f7cae0b529ad313ba07351c07965605 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 13:04:09 +0800
Subject: [PATCH] 管控线边仓库存
---
src/main/java/com/zy/asrs/controller/MobileController.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 639e1d4..3dd3986 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -23,7 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -58,19 +57,143 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @PostMapping("/pda/OutOrder")
+ @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�",value = ManagerAuth.Auth.NONE)
+ @Transactional
+ public R OutOrder(@RequestParam String orderNo) {
+ List<Order> orders=new ArrayList<Order>();
+ List<Order> OrderList=new ArrayList<Order>();
+ if(Cools.isEmpty(orderNo)){
+ orders= orderService.selectList(new EntityWrapper<Order>()
+ .in("settle",1,2)
+ );
+ }else{
+ orders= orderService.selectList(new EntityWrapper<Order>()
+ .like("order_no",orderNo)
+ .in("settle",1,2)
+ );
+ }
+ if(Cools.isEmpty(orders)){
+ return R.parse("鏃犳暟鎹�");
+ }
+ for (Order o:orders
+ ) {
+ DocType docType=docTypeService.selectOne(new EntityWrapper<DocType>()
+ .eq("doc_id",o.getDocType()));
+ if(docType.getPakout()==1){
+ OrderList.add(o);
+ }
+ }
+
+
+ return R.ok(OrderList);
+ }
+
+ @PostMapping("/pda/OutLocNo")
+ @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿",value = ManagerAuth.Auth.NONE)
+ @Transactional
+ public R OutLocNo(@RequestParam Long orderId) {
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
+ .eq("order_id", orderId)
+ );
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ List<String> list = new ArrayList<>();
+ for (OrderDetl o : orderDetls
+ ) {
+ if (o.getAnfme() <= o.getWorkQty()) {
+ continue;
+ } else {
+ //鏌ョ湅搴撲綅鏄庣粏涓湁鐨勭墿鏂�
+ List<ManLocDetl> locDetls = manLocDetlMapper.selectList(new EntityWrapper<ManLocDetl>()
+ .eq("matnr", o.getMatnr()).orderBy("modi_time",false)
+ );
+ if (Cools.isEmpty(locDetls)) {
+ continue;
+ } else {
+ for (ManLocDetl l : locDetls
+ ) {
+// String s = l.getLocNo().substring(0, 2);
+// if (Integer.parseInt(s) > 8) {
+ list.add(l.getLocNo());
+// }
+ }
+ }
+ }
+ }
+ List<String> myList = list.stream().distinct().collect(Collectors.toList());
+ return R.ok(myList);
+ }
+
+ @PostMapping("/pda/OrderDetlContrastLocDetl")
+ @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�",value = ManagerAuth.Auth.NONE)
+ @Transactional
+ public R OrderDetlContrastLocDetl(@RequestParam Long orderId, @RequestParam String locNo) {
+ List<ManLocDetl> locDetlList = new ArrayList<ManLocDetl>();
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
+ .eq("order_id", orderId)
+ );
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ List<ManLocDetl> locDetls = manLocDetlMapper.selectList(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", locNo));
+ if (Cools.isEmpty(locDetls)) {
+ return R.error("搴撲綅涓虹┖");
+ }
+ for (OrderDetl o : orderDetls
+ ) {
+ if(o.getAnfme().equals(o.getQty())){
+ continue;
+ }
+ for (ManLocDetl l : locDetls
+ ) {
+ if (o.getMatnr().equals(l.getMatnr())) {
+ if (o.getAnfme() - o.getWorkQty() >= l.getAnfme()) {
+
+ } else {
+ l.setAnfme(o.getAnfme() - o.getWorkQty());
+ }
+ locDetlList.add(l);
+ break;
+ }
+ }
+ }
+ return R.ok(locDetlList);
+ }
+
+ /**
+ * 骞冲韩涓嬫灦
+ */
+ @RequestMapping("/pda/WarehouseOut")
+ @ManagerAuth
+ public R WarehouseOut(@RequestBody CombParam combParam) {
+ return mobileService.WarehouseOut(combParam, getUserId());
+ }
+
+ /**
+ * 骞冲韩涓婃灦
+ */
+ @RequestMapping("/pda/WarehouseIn")
+ @ManagerAuth
+ public R WarehouseIn(@RequestParam String locNo, @RequestParam String barcode) {
+ return mobileService.WarehouseIn(locNo, barcode, getUserId());
+ }
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
public R matOnSale(@RequestBody CombParam combParam){
- mobileService.onSale(combParam);
+ mobileService.onSale(combParam, getUserId());
return R.ok("涓婃灦鎴愬姛");
}
+
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
//@ManagerAuth
public R matOffSale(@RequestBody OffSaleParam offSaleParam){
- mobileService.offSale(offSaleParam);
+ mobileService.offSale(offSaleParam, getUserId());
return R.ok("涓嬫灦鎴愬姛");
}
--
Gitblit v1.9.1