From bf50baf41cce651cfaf951056e976aefc077a757 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 07 四月 2025 16:01:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 258 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 199 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1cd79f7..29fb8e8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.List;
@@ -54,6 +56,12 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private OrderGiftService orderGiftService;
+ @Autowired
+ private OrderDetlGiftService orderDetlGiftService;
// 鍟嗗搧涓婃灦
@@ -72,10 +80,14 @@
}
@RequestMapping("/search/sign/auth/v2")
-// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+ @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
public R orderSearchByBarcodeV2(@RequestParam boolean sign){
- Integer signRu = 1;
- return R.ok(signRu);
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+ if (sign){
+ rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
+ rgvOneSignService.updateById(rgvOneSign);
+ }
+ return R.ok(rgvOneSign.getRgvOneSign());
}
@@ -157,7 +169,7 @@
if (Cools.isEmpty(orderNo)){
orderNo=null;
}
- List<Order> orders = orderService.selectorderNoL(orderNo);
+ List<Order> orders = orderService.selectorderNoLT(orderNo);
if (Cools.isEmpty(orders)){
return R.ok();
}
@@ -188,6 +200,7 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setWeight(orderDetl.getWeight());
combMats.add(combMat);
}
if (combMats.size()==0){
@@ -204,65 +217,171 @@
@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("鏈煡鍒版暟鎹�");
+ public R wrkDetlSearchByBatch(@RequestBody OrderGiftParam param){
+ try{
+ String length = param.getLength();
+ String lengthS = length.split(" ")[0];
+ Double price = Double.valueOf(lengthS);
+ String grossWeight = param.getGrossWeight();
+ String grossWeightS = grossWeight.split(" ")[0];
+ Double volume = Double.valueOf(grossWeightS);
+ String netWeight = param.getNetWeight();
+ String netWeightS = netWeight.split(" ")[0];
+ Double weight = Double.valueOf(netWeightS);
+ String splices = param.getSplices();
+ String splicesS = splices.split(" ")[0];
+ List<OrderDetlGift> orderDetlGifts = orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>()
+ .eq("matnr", param.getSpecs())
+ .eq("batch", param.getBoxNo())
+ .eq("model", param.getRollNo())
+ .eq("price", price)
+ .eq("weight", weight)
+ .eq("volume", volume)
+ .eq("specs", splicesS));
+ if (orderDetlGifts.isEmpty()){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
}
- wrkDetl = new WrkDetl();
- wrkDetl.sync(wrkDetlLog);
- wrkDetl.setBatch(wrkDetlLog.getBatch());
- wrkDetl.setBarcode(wrkDetlLog.getBarcode());
- wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ if (orderDetlGifts.size()>1){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屽瓨鍦ㄥ鏉℃槑缁�").add("瀛樺湪澶氭潯鏄庣粏");
+ }
+ OrderDetlGift orderDetlGift = orderDetlGifts.get(0);
+// orderDetlGift.setSource(1);
+// orderDetlGift.setDeadTime(orderDetlGift.getSource$());
+// orderDetlGiftService.updateById(orderDetlGift);
+ return R.ok("纭鎴愬姛").add(orderDetlGift);
+ } catch (Exception e){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
}
- 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("鏈煡鍒版暟鎹�");
+ public R orderSearchByBatch(@RequestBody OrderGiftParam param){
+ try{
+ String length = param.getLength();
+ String lengthS = length.split(" ")[0];
+ Double price = Double.valueOf(lengthS);
+ String grossWeight = param.getGrossWeight();
+ String grossWeightS = grossWeight.split(" ")[0];
+ Double volume = Double.valueOf(grossWeightS);
+ String netWeight = param.getNetWeight();
+ String netWeightS = netWeight.split(" ")[0];
+ Double weight = Double.valueOf(netWeightS);
+ String splices = param.getSplices();
+ String splicesS = splices.split(" ")[0];
+ List<OrderDetlGift> orderDetlGifts = orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>()
+ .eq("matnr", param.getSpecs())
+ .eq("batch", param.getBoxNo())
+ .eq("model", param.getRollNo())
+ .eq("price", price)
+ .eq("weight", weight)
+ .eq("volume", volume)
+ .eq("specs", splicesS));
+ if (orderDetlGifts.isEmpty()){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
}
- orderNo=wrkDetlLog.getOrderNo();
- }else {
- orderNo=wrkDetl.getOrderNo();
+ if (orderDetlGifts.size()>1){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屽瓨鍦ㄥ鏉℃槑缁�").add("瀛樺湪澶氭潯鏄庣粏");
+ }
+ OrderDetlGift orderDetlGift = orderDetlGifts.get(0);
+ orderDetlGift.setSource(1);
+ orderDetlGiftService.updateById(orderDetlGift);
+ orderDetlGift.setDeadTime(orderDetlGift.getSource$());
+ return R.ok("纭鎴愬姛").add(orderDetlGift);
+ } catch (Exception e){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
}
-// 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("/wrkDetl/search/batch/auth")
+// @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
+// public R wrkDetlSearchByBatch(@RequestBody String batch){
+// if (Cools.isEmpty(batch)){
+// return R.error("鍙傛暟涓虹┖");
+// }
+// String[] batch1 = batch.split("绠卞彿锛�");
+// String[] batch2 = batch1[1].split("瑙勬牸锛�");
+// batch = batch2[0].replaceAll(" ", "");
+//// List<Order> orders = orderService.selectorderNoL(batch);
+// WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
+//// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+// if (Cools.isEmpty(wrkDetl)){
+// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
+//// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+// 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){
+// try{
+// if (Cools.isEmpty(batch)){
+// return R.error("鍙傛暟涓虹┖");
+// }
+//// String[] batch1 = batch.split("绠卞彿锛�");
+//// String[] batch2 = batch1[1].split("瑙勬牸锛�");
+//// batch = batch2[0];
+// String orderNo = "";
+//// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+// WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
+// if (Cools.isEmpty(wrkDetl)) {
+//// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
+// if (Cools.isEmpty(wrkDetlLog)) {
+// return R.error("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
+// }
+// if (wrkDetlLog.getDeadTime().equals("宸茬‘璁�")) {
+// return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+// }
+// wrkDetlLog.setSource(1);
+// wrkDetlLogService.update(wrkDetlLog,new EntityWrapper<WrkDetlLog>().eq("batch",wrkDetlLog.getBatch()).eq("wrk_no",wrkDetlLog.getWrkNo()));
+// orderNo=wrkDetlLog.getOrderNo();
+// }else {
+// if (wrkDetl.getDeadTime().equals("宸茬‘璁�")) {
+// return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+// }
+// wrkDetl.setSource(1);
+// wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()).eq("wrk_no",wrkDetl.getWrkNo()));
+// 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("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo);
+// }
+// if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+// return R.error("浠诲姟鏈畬鎴�");
+// }
+// if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
+// return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
+// }
+// orderDetl.setSource(1);
+// orderDetlService.updateById(orderDetl);
+// return R.ok();
+// } catch (Exception e){
+// return R.error().add(e.getMessage());
+// }
+// }
+
+// @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妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
@@ -271,12 +390,33 @@
return R.ok("缁勬墭鎴愬姛");
}
-// @RequestMapping("/truss/comd/auth")
-// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
-// public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
-// mobileService.trussComb2(combParam, getUserId());
-// return R.ok("缁勬墭鎴愬姛");
-// }
+ @RequestMapping("/truss/comd/auth")
+// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱 wms鍏ュ簱")
+ public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
+ mobileService.PalletizingCompleteTwoFloorParam(combParam);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /**
+ * 涓帶锛�2妤�212鍙墭鐩�
+ */
+ @PostMapping("/balcony/complete/car/auth/v1")
+// @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
+ public synchronized R balconyCompleteCar() {
+// mobileService.trussComb2Car(212);
+ return R.error("宸茬鐢�").add("宸茬鐢�");
+ }
+
+ /**
+ * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+ */
+ @PostMapping("/box/type/complete/auth/v1")
+// @AppAuth(memo = "涓帶锛氳幏鍙栫鍨嬬紪鍙�")
+ public synchronized R boxTypeCompleteCar() {
+ List<Map<String, Object>> maps = mobileService.boxTypeComb();
+ return R.ok().add(maps);
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
--
Gitblit v1.9.1