From b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 16:18:24 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MobileController.java | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 165 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c324e16..716d347 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,20 +9,23 @@
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.model.enumUtils.OrderEnumVo;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
+import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
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;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -30,7 +33,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -54,23 +57,97 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private NccJcQilibcBarcodeflowWmsService nccJcQilibcBarcodeflowWmsService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @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")
@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("涓嬫灦鎴愬姛");
}
-
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -101,18 +178,19 @@
// }
@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);
- if (Cools.isEmpty(orders)){
+ List<OrderPakin> orderPakins = orderPakinService.selectorderNoL(orderNo);
+ //List<Order> orders = OrderInAndOutUtil.selectOrderNoL(OrderEnumVo.PAKIN.getCode(), orderNo);
+ if (Cools.isEmpty(orderPakins)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
- if (!Cools.isEmpty(orders)){
- for (Order order:orders){
- CombParam combParam=new CombParam();
+ if (!Cools.isEmpty(orderPakins)) {
+ for (OrderPakin order : orderPakins) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -123,14 +201,15 @@
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){
+ 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);
@@ -141,19 +220,40 @@
combParams.add(combParam);
}
}
- return R.ok().add(combParams);
+ return R.ok().add(combParams.get(0));
+ }
+
+ @RequestMapping(value = "/mat/search/auth")
+ @ManagerAuth
+ public R pdaSearchV2(@RequestParam String matnr) {
+ EntityWrapper<NccJcQilibcBarcodeflowWms> wrapper = new EntityWrapper<>();
+ wrapper.eq("VBARCODE", matnr).orderBy("ts", false);
+ NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms = nccJcQilibcBarcodeflowWmsService.selectOne(wrapper);
+ if (null == nccJcQilibcBarcodeflowWms) {
+ return R.error("鏈壘鍒版鏉＄爜");
+ } else {
+ if (!nccJcQilibcBarcodeflowWms.getInfla().equals("鍑哄簱")) {
+ return R.error("璇ユ潯鐮佹渶鍚庝竴娆′笉鏄嚭搴�");
+ }
+ }
+ Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
+ matParam.setAnfme(12D);
+ return R.ok().add(matParam);
}
@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();
@@ -166,7 +266,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("缁勬墭鎴愬姛");
}
@@ -179,7 +279,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();
}
@@ -203,7 +303,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();
}
@@ -217,10 +317,45 @@
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
- , @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);
@@ -233,7 +368,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();
}
@@ -368,7 +503,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("鐩樼偣鎴愬姛");
}
@@ -376,10 +511,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