From 90bce5d1f5cdb5fb07d2ce6b216c7ff14cf74680 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 14 四月 2025 08:09:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 183 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 173 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4a80660..81c633e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,20 +9,19 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -54,7 +53,74 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Resource
+ private StaDescService staDescService;
+
+ @RequestMapping("/pda/WarehouseOut/v1")
+ @ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
+ public R WarehouseOutV1(@RequestBody CombParam combParam) {
+ return mobileService.WarehouseOutV1(combParam, getHostId(), getUserId());
+ }
+
+ @RequestMapping("/pda/WarehouseOutPickMerge/v1")
+ @ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
+ public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
+ if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
+ }
+
+ @RequestMapping("/pick/in")
+ @ManagerAuth(memo = "骞舵澘鍏ュ簱")
+ public R pickConfirm(@RequestBody PickConfirmParam param) {
+
+ if(Cools.isEmpty(param,param.getList(),param.getLocNo(),param.getStaNo())) {
+ return R.parse("鍙傛暟涓嶅畬鏁�");
+ }
+ return mobileService.pickConfirm(param, getUserId());
+ }
+
+ @RequestMapping("/barcode/list/all")
+ @ManagerAuth(memo = "骞舵澘鍏ュ簱閫斾腑鎷ｆ枡鍑哄簱鑾峰彇浠诲姟淇℃伅")
+ public R orderOutListOrder(@RequestParam(required = false) String barcode) {
+ return mobileService.orderOutListOrder(barcode, getUserId());
+ }
+
+ @RequestMapping("/barcode/list/pick")
+ @ManagerAuth(memo = "鎷ｆ枡鍏ュ簱閫斾腑骞舵澘鑾峰彇浠诲姟淇℃伅")
+ public R orderOutListOrderPick(@RequestParam(required = false) String barcode) {
+ return mobileService.orderOutListOrderPick(barcode, getUserId());
+ }
+
+ @RequestMapping("/loc/f/list")
+ @ManagerAuth(memo = "鑾峰彇鍦ㄥ簱搴撲綅")
+ public R locNoF(@RequestParam(required = false) String locNo) {
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F");
+ if (!Cools.isEmpty(locNo)) {
+ wrapper.like("loc_no", locNo);
+ }
+ List<LocMast> list = locMastService.selectList(wrapper);
+ return R.ok().add(list);
+ }
+
+ @RequestMapping("/pick/sta/list")
+ @ManagerAuth(memo = "鑾峰彇骞舵澘绔�")
+ public R pickSta() {
+ List<StaDesc> list = staDescService.selectList(new EntityWrapper<StaDesc>()
+ .eq("type_no", 104));
+ return R.ok().add(list);
+ }
+
+ @RequestMapping("/pick/mat/list")
+ @ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
+ public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
+ return mobileService.pickMats(matnr, orderNo);
+ }
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -99,13 +165,62 @@
// }
// return R.ok().add(orderDetls);
// }
+
+
+// @RequestMapping("/order/search/orderNo/auth")
+// @ManagerAuth
+// 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)){
+// return R.ok();
+// }
+// LinkedList<CombParam> combParams = new LinkedList<>();
+// if (!Cools.isEmpty(orders)){
+// for (Order order:orders){
+// CombParam combParam=new CombParam();
+// if (order == null) {
+// continue;
+// }
+// DocType docType = docTypeService.selectById(order.getDocType());
+// if (docType.getPakin() == null || docType.getPakin() != 1) {
+// continue;
+// }
+// if (order.getSettle() > 2) {
+// continue;
+// }
+//// 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){
+// CombParam.CombMat combMat = new CombParam.CombMat();
+// combMat.setMatnr(orderDetl.getMatnr());
+// combMat.setBatch(orderDetl.getBatch());
+// combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+// combMat.setMaktx(orderDetl.getMaktx());
+// combMat.setSpecs(orderDetl.getSpecs());
+// combMats.add(combMat);
+// }
+// combParam.setCombMats(combMats);
+// }
+// combParam.setOrderNo(order.getOrderNo());
+// combParams.add(combParam);
+// }
+// }
+// return R.ok().add(combParams);
+// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
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)){
return R.ok();
}
@@ -123,31 +238,44 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(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){
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());
+ combMat.setBrand(orderDetl.getBrand());
+ combMat.setSku(orderDetl.getSku());
+ combMat.setMemo(orderDetl.getMemo());
+ combMat.setBoxType1(orderDetl.getBoxType1());
+ combMat.setBoxType2(orderDetl.getBoxType2());
+ combMat.setBoxType3(orderDetl.getBoxType3());
+ combMat.setStandby1(orderDetl.getStandby1());
+ combMat.setStandby2(orderDetl.getStandby2());
+ combMat.setStandby3(orderDetl.getStandby3());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
combParam.setOrderNo(order.getOrderNo());
- combParams.add(combParam);
+ return R.ok().add(combParam);
+
+// combParams.add(combParam);
}
}
return R.ok().add(combParams);
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+// @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+// mobileService.comb(combParam, getUserId());
+ mobileService.comb(combParam, 9999L);
return R.ok("缁勬墭鎴愬姛");
}
@@ -217,6 +345,41 @@
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()));
+ 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())){
+ orderDetl = orderDetl1;
+ break;
+ }
+ }
+ if (Cools.isEmpty(orderDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+// orderDetlService.updateById(orderDetl);
+ OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
+ return R.ok();
+ }
+
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
--
Gitblit v1.9.1