From e62569856fdfb0c7c31ee88cf96628af08eabf85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 12:34:15 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/controller/MobileController.java | 128 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 50b43af..19defbf 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,7 +13,6 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +20,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.util.*;
/**
@@ -30,35 +28,51 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
+
@Autowired
private LocMastService locMastService;
+
@Autowired
private LocDetlService locDetlService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
+
@Autowired
private DocTypeService docTypeService;
+
@Autowired
private WrkMastService wrkMastService;
+
@Autowired
private WrkDetlService wrkDetlService;
+
@Autowired
private BasDevpService basDevpService;
+
@Autowired
private PackService packService;
+
@Autowired
private ManLocDetlMapper manLocDetlMapper;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Resource
+ @Autowired
private StaDescService staDescService;
+
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
+
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -69,7 +83,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());
@@ -79,7 +93,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());
@@ -123,17 +137,27 @@
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){
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
@@ -157,6 +181,16 @@
return mobileService.callAgvMove(params, getUserId());
}
+
+ @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());
+ }
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -187,19 +221,18 @@
// }
@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 = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
- if (Cools.isEmpty(orders)){
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
+ 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 (OrderPakin order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -210,15 +243,14 @@
if (order.getSettle() > 2) {
continue;
}
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetlPakin 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);
@@ -234,14 +266,14 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
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();
@@ -254,7 +286,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -267,7 +299,7 @@
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -291,7 +323,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();
}
@@ -312,38 +344,34 @@
*/
@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()));
- 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())){
+ List<OrderPakout> orders = orderPakoutService.selectorderNoL(combParam.getOrderNo());
+ List<OrderDetlPakout> orderDetlList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ OrderDetlPakout orderDetl = null;
+ for (OrderDetlPakout 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);
+ orderDetlPakoutService.updateById(orderDetl);
return R.ok();
}
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
return R.ok(manLocDetl);
@@ -356,7 +384,7 @@
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -491,7 +519,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("鐩樼偣鎴愬姛");
}
@@ -499,10 +527,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