From 2a2d0aa9f6c42789faeb90ccda0bdf415614d533 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 八月 2025 10:46:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/MobileController.java | 256 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 198 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2077292..8bf5fc0 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,14 +11,20 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
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.stream.Collectors;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -26,7 +32,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -55,33 +61,47 @@
@Autowired
private RgvOneSignService rgvOneSignService;
+ @Resource
+ private OrderMapper orderMapper;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
+ @Resource
+ private ReviewService reviewService;
+
+ @Resource
+ private ReviewDetlService reviewDetlService;
+
+ @Resource
+ private UserService userService;
// 鍟嗗搧涓婃灦
@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("涓嬫灦鎴愬姛");
}
@RequestMapping("/search/sign/auth/v2")
@ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
- public R orderSearchByBarcodeV2(@RequestParam boolean sign){
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
- if (sign){
- rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
+ public R orderSearchByBarcodeV2(@RequestParam boolean sign) {
+ 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());
}
-
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -112,18 +132,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);
- if (Cools.isEmpty(orders)){
+ 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 (Order order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -137,11 +157,11 @@
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(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);
@@ -157,18 +177,18 @@
@RequestMapping("/order/search/orderNo/auth/v2")
@ManagerAuth(memo = "閫�搴撳崟鑾峰彇")
- public R orderSearchByBarcodeV2(@RequestParam String orderNo){
- if (Cools.isEmpty(orderNo)){
- orderNo=null;
+ public R orderSearchByBarcodeV2(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
}
List<Order> orders = orderService.selectorderNoL(orderNo);
- if (Cools.isEmpty(orders)){
+ 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 (Order order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -182,20 +202,20 @@
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){
+ 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.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
combMat.setWeight(orderDetl.getWeight());
combMats.add(combMat);
}
- if (combMats.size()==0){
+ if (combMats.size() == 0) {
continue;
}
combParam.setCombMats(combMats);
@@ -209,15 +229,15 @@
@RequestMapping("/wrkDetl/search/batch/auth")
@ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
- public R wrkDetlSearchByBatch(@RequestBody String batch){
- if (Cools.isEmpty(batch)){
+ 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)){
+ if (Cools.isEmpty(wrkDetl)) {
WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
- if (Cools.isEmpty(wrkDetlLog)){
+ if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�");
}
wrkDetl = new WrkDetl();
@@ -226,7 +246,7 @@
wrkDetl.setBarcode(wrkDetlLog.getBarcode());
wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
}
- if (Cools.isEmpty(wrkDetl)){
+ if (Cools.isEmpty(wrkDetl)) {
return R.error("鏈煡鍒版暟鎹�");
}
return R.ok().add(wrkDetl);
@@ -234,8 +254,8 @@
@RequestMapping("/order/search/batch/auth")
@ManagerAuth(memo = "鍑哄簱纭")
- public R orderSearchByBatch(@RequestBody String batch){
- if (Cools.isEmpty(batch)){
+ public R orderSearchByBatch(@RequestBody String batch) {
+ if (Cools.isEmpty(batch)) {
return R.error("鍙傛暟涓虹┖");
}
String orderNo = "";
@@ -245,16 +265,16 @@
if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�");
}
- orderNo=wrkDetlLog.getOrderNo();
- }else {
- orderNo=wrkDetl.getOrderNo();
+ 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)){
+ 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("宸插畬鎴�")){
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
orderDetl.setSource(1);
@@ -271,14 +291,14 @@
@RequestMapping("/truss/order/auth")
@ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
- public R trussCombOrder(@RequestBody TrussCombParam combParam){
+ public R trussCombOrder(@RequestBody TrussCombParam combParam) {
mobileService.trussCombOrder(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/truss/comd/auth")
// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱 wms鍏ュ簱")
- public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
+ public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam) {
mobileService.PalletizingCompleteTwoFloorParam(combParam);
return R.ok("缁勬墭鎴愬姛");
}
@@ -306,14 +326,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();
@@ -326,7 +346,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("缁勬墭鎴愬姛");
}
@@ -339,7 +359,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();
}
@@ -363,7 +383,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();
}
@@ -380,7 +400,7 @@
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@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);
@@ -393,7 +413,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();
}
@@ -528,7 +548,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("鐩樼偣鎴愬姛");
}
@@ -536,31 +556,151 @@
@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("鍑哄簱鎴愬姛");
}
@PostMapping("/ckfh/auth")
@ManagerAuth(memo = "鍑哄簱澶嶆牳纭")
- public synchronized R pakoutFhqr(@RequestBody GhjtApiParam param) {
+ public synchronized R pakoutFhqr(@RequestBody PdckqrParam param) {
// 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
- if(Cools.isEmpty(param) || Cools.isEmpty(param.getWorkNo()) || Cools.isEmpty(param.getCheck())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutFhqr(param.getWorkNo(), param.getCheck());
- return R.ok("澶嶆牳纭鎴愬姛");
+ return mobileService.pakoutFhqr(param);
}
@PostMapping("/pdckqr/auth")
@ManagerAuth(memo = "鐩樼偣鍑哄簱纭")
public synchronized R pdckqr(@RequestBody PdckqrParam param) {
// 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
- if(Cools.isEmpty(param) || Cools.isEmpty(param.getWorkNo()) || Cools.isEmpty(param.getMaterials())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())) {
return R.parse(BaseRes.PARAM);
}
return mobileService.pdckqr(param);
}
+
+ @PostMapping("/pdtz/auth")
+ @ManagerAuth(memo = "鐩樼偣寮傚父鎸夊疄鐗╄皟鏁村簱瀛樹俊鎭�")
+ public synchronized R pdtz(@RequestBody PdtzParam param) {
+ return mobileService.pdtz(param);
+ }
+
+ @PostMapping("/pdaWarehousingNow")
+ @ManagerAuth(memo = "pda缁勬墭绔嬪嵆鍏ュ簱")
+ public synchronized R pdaWarehousingNow(@RequestBody PdaWarehousingNowParam param) {
+
+ // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getSourceStaNo())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return mobileService.pdaWarehousingNow(param, getUserId());
+
+ }
+
+
+ @PostMapping("/pdaFxprk")
+ @ManagerAuth(memo = "pda鍙嶄慨鍝佸叆搴�")
+ public synchronized R pdaFxprk(@RequestBody GwmsGenerateInventoryDto param) {
+
+ return mobileService.pdaFxprk(param, getUserId());
+ }
+
+ @PostMapping("/pdaBoxIn")
+ @ManagerAuth(memo = "pda绌虹鍏ュ簱")
+ public synchronized R pdaBoxIn(@RequestBody BoxInParam param) {
+
+ return mobileService.pdaBoxIn(param, getUserId());
+ }
+
+ @PostMapping("/pdaGetMemo")
+// @ManagerAuth(memo = "pda鑾峰彇鏈ㄧ璧勬枡")
+ public synchronized List<Map<String, Object>> pdaGetMemo() {
+ return mobileService.pdaGetMemo();
+ }
+
+ @PostMapping("/pdaFhhd")
+ @ManagerAuth(memo = "pda鍙戣揣鏍稿")
+ public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) {
+
+ if (Cools.isEmpty(param)) {
+ return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�");
+ }
+
+ return mobileService.pdaFhhd(param, getUserId());
+ }
+
+ @GetMapping("/getOrderNoList/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋ā绯婃煡璇㈠崟鎹�")
+ public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo));
+
+ }
+
+ @GetMapping("/getOrderDetlByOrderNo/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋煡璇㈠崟鎹槑缁�")
+ public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderDetlMapper.selectDetlList(orderNo));
+
+ }
+
+
+ @GetMapping("/getReviewList")
+ public synchronized R getReviewList(@RequestParam(value = "orderNo", required = false) String orderNo) {
+ List<Review> reviewList;
+ if (Cools.isEmpty(orderNo)) {
+ reviewList = reviewService.selectList(new EntityWrapper<Review>().in("settle", 1, 2));
+ }else {
+ reviewList = reviewService.selectList(new EntityWrapper<Review>().like("order_no", orderNo).in("settle", 1, 2));
+ }
+ List<String> collect = reviewList.stream().map(Review::getOrderNo).collect(Collectors.toList());
+ return R.ok(collect);
+
+ }
+
+ @GetMapping("/getReviewDetlByOrderNo/{orderNo}")
+ public synchronized R getReviewDetlByOrderNo(@PathVariable(value = "orderNo") String orderNo) {
+ List<ReviewDetl> reviewList = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", orderNo).ne("inspect", 1));
+ return R.ok(reviewList);
+
+ }
+
+
+ @PostMapping("/reviewCheck")
+ @ManagerAuth(memo = "鍗曟嵁澶嶆牳")
+ public synchronized R reviewCheck(@RequestBody List<ReviewDetl> param) {
+ System.out.println(JSONObject.toJSONString(param));
+ if (Cools.isEmpty(param)) {
+ return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�");
+ }
+ for (ReviewDetl reviewDetl : param) {
+ if (!Cools.isEmpty(reviewDetl.getInspect()) && reviewDetl.getInspect() == 1) {
+ ReviewDetl reviewDetl1 = reviewDetlService.selectById(reviewDetl.getId());
+ reviewDetl1.setInspect(reviewDetl.getInspect());
+ reviewDetl1.setMemo(reviewDetl.getMemo());
+ reviewDetl1.setThreeCode(reviewDetl.getThreeCode());
+ reviewDetl1.setUpdateTime(new Date());
+ reviewDetlService.updateById(reviewDetl1);
+ Review review = reviewService.selectById(reviewDetl1.getOrderId());
+ review.setSettle(2L);
+ reviewService.updateById(review);
+ }
+ }
+ return R.ok();
+ }
+
+ @GetMapping("/getCheckUser")
+ public R getCheckUser() {
+ Set set = new HashSet<String>();
+ List<User> userList = userService.selectList(new EntityWrapper<User>().eq("status", 1).eq("role_id", 18L));
+ for (User user : userList) {
+ set.add(user.getUsername());
+ }
+ return R.ok(set);
+ }
}
--
Gitblit v1.9.1