From eb17d664dd8c1957e2ca6668ac70b3d49dca7329 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 一月 2024 11:04:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 212 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 70ddb33..1cd79f7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,13 +9,10 @@
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.common.model.LocDto;
-import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -52,6 +50,10 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
// 鍟嗗搧涓婃灦
@@ -68,32 +70,213 @@
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
+
+ @RequestMapping("/search/sign/auth/v2")
+// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+ public R orderSearchByBarcodeV2(@RequestParam boolean sign){
+ Integer signRu = 1;
+ return R.ok(signRu);
+ }
+
+
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
/**
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
+ * http://localhost:8081/jtwms/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) {
+ if (Cools.isEmpty(orderNo)){
+ orderNo=null;
+ }
+ List<Order> orders = orderService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)){
return R.ok();
}
- DocType docType = docTypeService.selectById(order.getDocType());
- if (docType.getPakin() == null || docType.getPakin() != 1) {
- 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());
+ 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);
+ }
}
- 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);
+ return R.ok().add(combParams);
}
+
+ @RequestMapping("/order/search/orderNo/auth/v2")
+ @ManagerAuth(memo = "閫�搴撳崟鑾峰彇")
+ public R orderSearchByBarcodeV2(@RequestParam String orderNo){
+ if (Cools.isEmpty(orderNo)){
+ orderNo=null;
+ }
+ List<Order> orders = orderService.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 (order == null) {
+ continue;
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1 || !docType.getDocName().equals("閫�璐у叆搴撳崟")) {
+ continue;
+ }
+ if (order.getSettle() > 2) {
+ continue;
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+ for (OrderDetl orderDetl:orderDetls){
+ if (orderDetl.getWorkQty()!=0){
+ continue;
+ }
+ 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);
+ }
+ if (combMats.size()==0){
+ continue;
+ }
+ combParam.setCombMats(combMats);
+ }
+ combParam.setOrderNo(order.getOrderNo());
+ combParams.add(combParam);
+ }
+ }
+ return R.ok().add(combParams);
+ }
+
+ @RequestMapping("/wrkDetl/search/batch/auth")
+ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
+ public R wrkDetlSearchByBatch(@RequestBody String batch){
+ if (Cools.isEmpty(batch)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+// List<Order> orders = orderService.selectorderNoL(batch);
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetl)){
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetlLog)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlLog);
+ wrkDetl.setBatch(wrkDetlLog.getBatch());
+ wrkDetl.setBarcode(wrkDetlLog.getBarcode());
+ wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ }
+ if (Cools.isEmpty(wrkDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ return R.ok().add(wrkDetl);
+ }
+
+ @RequestMapping("/order/search/batch/auth")
+ @ManagerAuth(memo = "鍑哄簱纭")
+ public R orderSearchByBatch(@RequestBody String batch){
+ if (Cools.isEmpty(batch)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ String orderNo = "";
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetl)) {
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetlLog)) {
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ orderNo=wrkDetlLog.getOrderNo();
+ }else {
+ orderNo=wrkDetl.getOrderNo();
+ }
+// List<Order> orders = orderService.selectorderNoL(batch);
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
+ if (Cools.isEmpty(orderDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
+ }
+
+ @RequestMapping("/truss/auth")
+ @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴�")
+ public R trussComb(@RequestBody TrussCombParam combParam){
+ mobileService.trussComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/truss/order/auth")
+ @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
+ public R trussCombOrder(@RequestBody TrussCombParam combParam){
+ mobileService.trussCombOrder(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+// @RequestMapping("/truss/comd/auth")
+// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
+// public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
+// mobileService.trussComb2(combParam, getUserId());
+// return R.ok("缁勬墭鎴愬姛");
+// }
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
@@ -168,6 +351,16 @@
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);
+ ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
+ return R.ok(manLocDetl);
+ //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
+ }
+
/**
* 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
*/
--
Gitblit v1.9.1