From 7a3227174bde55918aef6f411489d0dd24c3b129 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 14:09:46 +0800
Subject: [PATCH] 工作历史档可搜索返修品
---
src/main/java/com/zy/asrs/controller/MobileController.java | 218 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 198 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 59d2898..96b3c97 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -12,6 +11,8 @@
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;
@@ -19,8 +20,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -54,6 +55,14 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+
+ @Resource
+ private OrderMapper orderMapper;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
// 鍟嗗搧涓婃灦
@@ -69,6 +78,17 @@
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());
+ rgvOneSignService.updateById(rgvOneSign);
+ }
+ return R.ok(rgvOneSign.getRgvOneSign());
}
@@ -144,8 +164,60 @@
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());
+ combMat.setWeight(orderDetl.getWeight());
+ 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
+ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
@@ -170,43 +242,76 @@
}
@RequestMapping("/order/search/batch/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍑哄簱纭")
public R orderSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
-// List<Order> orders = orderService.selectorderNoL(batch);
+ String orderNo = "";
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();
- wrkDetl.sync(wrkDetlLog);
- wrkDetl.setBatch(wrkDetlLog.getBatch());
- wrkDetl.setBarcode(wrkDetlLog.getBarcode());
- wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ orderNo=wrkDetlLog.getOrderNo();
+ }else {
+ orderNo=wrkDetl.getOrderNo();
}
- if (Cools.isEmpty(wrkDetl)){
+// 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());
+// @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());
+// @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.ok();
+ }
+
+ /**
+ * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+ */
+ @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 = "缁勬墭")
@@ -447,4 +552,77 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @PostMapping("/ckfh/auth")
+ @ManagerAuth(memo = "鍑哄簱澶嶆牳纭")
+ public synchronized R pakoutFhqr(@RequestBody PdckqrParam param) {
+ // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
+ if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){
+ return R.parse(BaseRes.PARAM);
+ }
+ return mobileService.pakoutFhqr(param);
+ }
+
+ @PostMapping("/pdckqr/auth")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱纭")
+ public synchronized R pdckqr(@RequestBody PdckqrParam param) {
+ // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
+ 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("/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));
+
+ }
+
}
--
Gitblit v1.9.1