From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/MobileController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 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 1dedaf7..961c954 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;
@@ -10,6 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
@@ -22,7 +22,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -54,6 +53,20 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+
+ @PostMapping("/inbound/auth")
+ @ManagerAuth
+ public R pdaInbound(@RequestBody JSONObject param){ //pda鍏ュ簱
+ return R.ok();
+ }
+
+ @PostMapping("/outbound/auth")
+ @ManagerAuth(memo = "pda鍑哄簱")
+ public R pdaOutbound(@RequestBody JSONObject param){ //pda鍑哄簱
+ return mobileService.pdaOutbound(param,getUserId());
+ }
// 鍟嗗搧涓婃灦
@@ -69,6 +82,16 @@
public R matOffSale(@RequestBody OffSaleParam offSaleParam){
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
+ }
+
+ @PostMapping("/manualCallEmptyTray")
+ @ManagerAuth(memo = "pda鍛煎彨绌烘墭鐩�")
+ public R manualCallEmptyTray(@RequestBody Map<String, Object> param){
+ if (Cools.isEmpty(param.get("stnNo"))){
+ throw new CoolException("绌烘墭鐩樺嚭搴撶珯鐐逛笉鑳戒负绌�");
+ }
+
+ return mobileService.manualCallEmptyTray((Integer) param.get("stnNo"),getUserId());
}
@@ -130,7 +153,9 @@
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme());
+ combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -143,7 +168,7 @@
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "pda缁勬墭")
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
@@ -215,6 +240,31 @@
return R.ok();
}
+ /**
+ * 鍑哄簱纭 - 鎵揣鐗� 骞垮痉瀹滅鐗�
+ * 1.鍏ㄦ澘 杩斿洖 101
+ * 2.鎷ｆ枡 杩斿洖 103
+ */
+ @RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
+ @ManagerAuth
+ public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
+ if (Cools.isEmpty(combParam)) {
+ return R.ok();
+ }
+// List<Order> orders = orderService.selectorderNoL(batch);
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
+ if (Cools.isEmpty(orderDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
+ }
+
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
--
Gitblit v1.9.1