From 05466547c913ad2cd29944e5444dd387ce64b25f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 16:07:48 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/controller/MobileController.java | 179 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 91 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2cf05fe..18fd4de 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -30,7 +30,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -62,20 +62,26 @@
@PostMapping("/agv/collectionPakin/view")
@ManagerAuth
- public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params){
+ public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
return mobileService.collectionPakinView(params);
}
+ /**
+ * SO/EO 鍖虹粍鎵�
+ * @author Ryan
+ * @date 2025/12/18 15:19
+ * @param params
+ * @return com.core.common.R
+ */
@PostMapping("/agv/collectionPakin/auth")
@ManagerAuth
- public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params){
+ public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params) {
return mobileService.collectionPakin(params, getUserId());
}
-
@PostMapping("/agv/callEmptyCar")
@ManagerAuth
- public R pdaAgvFinishedCall(@RequestBody AgvCallParams params){
+ public R pdaAgvFinishedCall(@RequestBody AgvCallParams params) {
return mobileService.callEmptyCar(params, getUserId());
}
@@ -88,7 +94,7 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+ if (Cools.isEmpty(param, param.getLocNo(), param.getBarcode(), param.getCombMats())) {
return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
}
return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
@@ -98,7 +104,7 @@
@ManagerAuth(memo = "骞舵澘鍏ュ簱")
public R pickConfirm(@RequestBody PickConfirmParam param) {
- if(Cools.isEmpty(param,param.getList(),param.getLocNo(),param.getStaNo())) {
+ if (Cools.isEmpty(param, param.getList(), param.getLocNo(), param.getStaNo())) {
return R.parse("鍙傛暟涓嶅畬鏁�");
}
return mobileService.pickConfirm(param, getUserId());
@@ -154,18 +160,18 @@
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
+ public R matOnSale(@RequestBody CombParam combParam) {
mobileService.onSale(combParam);
return R.ok("涓婃灦鎴愬姛");
}
+
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
- //@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ // @ManagerAuth
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
-
@GetMapping("/cache/locs")
@ManagerAuth
@@ -173,7 +179,6 @@
public R getCacheLocs() {
return mobileService.getCacheLocs();
}
-
@PostMapping("/cache/agv/call")
@ApiOperation("缂撳啿鍖哄叆搴�")
@@ -195,7 +200,6 @@
return mobileService.collectionInCall(params, getUserId());
}
-
/**
* @author Ryan
* @date 2025/11/3
@@ -214,6 +218,7 @@
/**
* 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ *
* @author Ryan
* @date 2025/12/8 13:45
* @param params
@@ -229,9 +234,9 @@
return mobileService.combOutPub(params);
}
-
/**
* 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ *
* @author Ryan
* @date 2025/12/8 13:45
* @param params
@@ -247,49 +252,48 @@
return mobileService.combCacehList(params);
}
-
-
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
+ // 缁勬墭
+ // ----------------------------------------------------------------------------------------------------
/**
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
* http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
*/
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
+ // @RequestMapping("/order/search/orderNo/auth")
+ // @ManagerAuth
+ // public R orderSearchByBarcode(@RequestParam String orderNo){
+ // Order order = orderService.selectByNo(orderNo);
+ // if (order == null) {
+ // return R.ok();
+ // }
+ // DocType docType = docTypeService.selectById(order.getDocType());
+ // if (docType.getPakin() == null || docType.getPakin() != 1) {
+ // return R.ok();
+ // }
+ // if (order.getSettle() > 2) {
+ // return R.ok();
+ // }
+ // List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ // if (Cools.isEmpty(orderDetls)) {
+ // return R.ok();
+ // }
+ // return R.ok().add(orderDetls);
+ // }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
- if (Cools.isEmpty(orderNo)){
- orderNo=null;
+ public R orderSearchByBarcode(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
}
-// List<Order> orders = orderService.selectorderNoL(orderNo);
+ // List<Order> orders = orderService.selectorderNoL(orderNo);
List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
- if (Cools.isEmpty(orders)){
+ if (Cools.isEmpty(orders)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
- if (!Cools.isEmpty(orders)){
- for (Order order:orders){
- CombParam combParam=new CombParam();
+ if (!Cools.isEmpty(orders)) {
+ for (Order order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -300,15 +304,16 @@
if (order.getSettle() > 2) {
continue;
}
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
+ // List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(),
+ order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetl orderDetl : orderDetls) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
combMats.add(combMat);
@@ -322,15 +327,12 @@
return R.ok().add(combParams);
}
-
-
@ManagerAuth(memo = "缁勬墭")
@RequestMapping("/comb/auth")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
-
@ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
@RequestMapping("/cache/comb/auth")
@@ -342,7 +344,6 @@
return R.ok("缁勬墭鎴愬姛");
}
-
@ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
@RequestMapping("/cache/comb/pub")
public R cacheCombPub(@RequestBody CompleteParam combParam) {
@@ -353,10 +354,9 @@
return R.ok("涓婃灦鎴愬姛");
}
-
@RequestMapping("/pack/get/auth")
@ManagerAuth
- public R packGet(@RequestParam String barcode){
+ public R packGet(@RequestParam String barcode) {
Pack pack = packService.selectByBarcode(barcode);
if (pack == null) {
return R.ok();
@@ -369,20 +369,20 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, 10031L);
return R.ok("缁勬墭鎴愬姛");
}
-
- // 鍑哄簱 ---------------------------------------------------------------------------------------------------
+ // 鍑哄簱
+ // ---------------------------------------------------------------------------------------------------
@RequestMapping("/pakout/query/auth")
@ManagerAuth
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
- @RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) Integer staNo,
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -406,7 +406,7 @@
*/
@RequestMapping("/pakout/confirm/barcode/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
if (Cools.isEmpty(barcode)) {
return R.ok();
}
@@ -415,54 +415,57 @@
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
- return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
+ return R.ok().add(
+ Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
}
return R.ok();
}
/**
- * 鍑哄簱纭 - 鎵揣鐗� 骞垮痉瀹滅鐗�
+ * 鍑哄簱纭 - 鎵揣鐗� 骞垮痉瀹滅鐗�
* 1.鍏ㄦ澘 杩斿洖 101
* 2.鎷ｆ枡 杩斿洖 103
*/
- @RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
+ @RequestMapping("/pakout/confirm/goods/auth") // 寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
@ManagerAuth
- public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
+ 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()));
+ // 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()));
Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
OrderDetl orderDetl = null;
- for (OrderDetl orderDetl1 : orderDetlList){
- if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())){
+ for (OrderDetl orderDetl1 : orderDetlList) {
+ if (combParam.getMatnr().equals(orderDetl1.getMatnr())
+ && combParam.getBatch().equals(orderDetl1.getBatch())) {
orderDetl = orderDetl1;
break;
}
}
- if (Cools.isEmpty(orderDetl)){
+ if (Cools.isEmpty(orderDetl)) {
return R.error("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
- //澶嶆牳鏁�
+ // 澶嶆牳鏁�
orderDetl.setSource(1);
-// orderDetlService.updateById(orderDetl);
- OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
+ // orderDetlService.updateById(orderDetl);
+ OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE, order, orderDetl);
return R.ok();
}
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
- public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
- //List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
+ public R find(@RequestParam(required = false) String locNo, @RequestParam(required = false) String matnr) {
+ // List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
return R.ok(manLocDetl);
- //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
+ // return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
}
/**
@@ -470,8 +473,8 @@
*/
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo,
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -493,7 +496,8 @@
}
}
// 鏇挎崲 鏄庣粏
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
+ List<LocDetl> locDetls = locDetlService
+ .selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
for (LocDetl locDetl : locDetls) {
if ((locDetl.getMatnr() + "-" + locDetl.getBatch()).equals(matnr)) {
WrkDetl wrkDetl = new WrkDetl();
@@ -506,7 +510,6 @@
}
return R.error("绯荤粺閿欒锛屾潯鐮佷笉瀛樺湪");
}
-
@RequestMapping("/pakout/confirm/auth")
@ManagerAuth
@@ -578,8 +581,8 @@
return R.ok("瀹屾垚纭");
}
-
- // 鐩樼偣 ----------------------------------------------------------------------------------------------------
+ // 鐩樼偣
+ // ----------------------------------------------------------------------------------------------------
@RequestMapping("/checkDetl/auth")
@ManagerAuth
@@ -606,7 +609,7 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
@@ -614,10 +617,10 @@
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutByOrder(param,getUserId());
+ mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
--
Gitblit v1.9.1