From bb2e781a57a96dfdd1f20d6eceddeafbd86be784 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 08:43:13 +0800
Subject: [PATCH] 物料同步信息修改
---
src/main/java/com/zy/asrs/controller/MobileController.java | 281 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 206 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6a9a1e9..2679d9f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -59,6 +60,24 @@
@Resource
private StaDescService staDescService;
+ @PostMapping("/agv/collectionPakin/view")
+ @ManagerAuth
+ public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
+ return mobileService.collectionPakinView(params);
+ }
+
+ @PostMapping("/agv/collectionPakin/auth")
+ @ManagerAuth
+ public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params) {
+ return mobileService.collectionPakin(params, getUserId());
+ }
+
+ @PostMapping("/agv/callEmptyCar")
+ @ManagerAuth
+ public R pdaAgvFinishedCall(@RequestBody AgvCallParams params) {
+ return mobileService.callEmptyCar(params, getUserId());
+ }
+
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
public R WarehouseOutV1(@RequestBody CombParam combParam) {
@@ -68,7 +87,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());
@@ -78,7 +97,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());
@@ -122,64 +141,152 @@
return mobileService.pickMats(matnr, orderNo);
}
+ @PostMapping("/scan/order/mats")
+ @ManagerAuth(memo = "鎵爜鑾峰彇缁勬墭鐗╂枡")
+ public R scanMats(@RequestBody PakinMatsByQRParams params) {
+ if (Objects.isNull(params)) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getMatsByQRcode(params);
+ }
+
// 鍟嗗搧涓婃灦
@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
+ @ApiOperation("鑾峰彇缂撳瓨鍖哄簱浣嶄俊鎭�")
+ public R getCacheLocs() {
+ return mobileService.getCacheLocs();
+ }
+ @PostMapping("/cache/agv/call")
+ @ApiOperation("缂撳啿鍖哄叆搴�")
+ @ManagerAuth
+ public R callAgvMove(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.callAgvMove(params, getUserId());
+ }
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
+ @PostMapping("/collection/agv/call")
+ @ApiOperation("闆嗚揣鍖哄叆搴�")
+ @ManagerAuth
+ public R CollectionInCall(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.collectionInCall(params, getUserId());
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/11/3
+ * @description: 鍛煎彨AGV鎼繍鍏ュ簱缂撳瓨鍖�/EO/SO
+ * @version 1.0
+ */
+ @PostMapping("/cache/out/call")
+ @ApiOperation("鍛煎彨AGV鎼繍")
+ @ManagerAuth
+ public R OutCallAgv(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.OutCallAgv(params, getUserId());
+ }
+
+ /**
+ * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ *
+ * @author Ryan
+ * @date 2025/12/8 13:45
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("缂撳瓨鍑哄簱涓婃灦")
+ @PostMapping("/commb/task/pub")
+ public R combPub(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.combOutPub(params);
+ }
+
+ /**
+ * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+ *
+ * @author Ryan
+ * @date 2025/12/8 13:45
+ * @param params
+ * @return com.core.common.R
+ */
+ @ManagerAuth
+ @ApiOperation("缂撳瓨鍑哄簱鍒楄〃")
+ @PostMapping("/cache/task/list")
+ public R combCacehList(@RequestBody AgvCallParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ 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;
}
@@ -190,15 +297,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);
@@ -212,16 +320,36 @@
return R.ok().add(combParams);
}
- @RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ @RequestMapping("/comb/auth")
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+ @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+ @RequestMapping("/cache/comb/auth")
+ public R onlineComb(@RequestBody CombParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ mobileService.cacheComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
+ @RequestMapping("/cache/comb/pub")
+ public R cacheCombPub(@RequestBody CompleteParam combParam) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+ }
+ mobileService.combInPub(combParam, 10031L);
+ 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();
@@ -234,20 +362,20 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
- mobileService.packComb(combParam, getUserId());
+ 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();
}
@@ -271,7 +399,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();
}
@@ -280,54 +408,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));
}
/**
@@ -335,8 +466,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();
}
@@ -358,7 +489,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();
@@ -371,7 +503,6 @@
}
return R.error("绯荤粺閿欒锛屾潯鐮佷笉瀛樺湪");
}
-
@RequestMapping("/pakout/confirm/auth")
@ManagerAuth
@@ -443,8 +574,8 @@
return R.ok("瀹屾垚纭");
}
-
- // 鐩樼偣 ----------------------------------------------------------------------------------------------------
+ // 鐩樼偣
+ // ----------------------------------------------------------------------------------------------------
@RequestMapping("/checkDetl/auth")
@ManagerAuth
@@ -471,7 +602,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("鐩樼偣鎴愬姛");
}
@@ -479,10 +610,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