From b69791c7b86d65728a074bd79932bfa9a017f081 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 25 十月 2023 17:17:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 186 ++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index af7f3fb..639e1d4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,6 +2,7 @@
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;
@@ -9,11 +10,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
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;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -51,7 +54,27 @@
@Autowired
private PackService packService;
@Autowired
- private WorkService workService;
+ private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+
+
+ // 鍟嗗搧涓婃灦
+ @RequestMapping("/mat/onSale/auth")
+ @ManagerAuth
+ public R matOnSale(@RequestBody CombParam combParam){
+ mobileService.onSale(combParam);
+ return R.ok("涓婃灦鎴愬姛");
+ }
+ // 鍟嗗搧涓嬫灦
+ @RequestMapping("/mat/offSale/auth")
+ //@ManagerAuth
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ mobileService.offSale(offSaleParam);
+ return R.ok("涓嬫灦鎴愬姛");
+ }
+
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -59,25 +82,69 @@
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
* http://localhost:8081/jkwms/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("/comb/auth")
@@ -151,6 +218,41 @@
return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
}
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()));
+ if (Cools.isEmpty(orderDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ 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));
}
/**
@@ -299,58 +401,14 @@
return R.ok("鐩樼偣鎴愬姛");
}
- @PostMapping("/out/pakout/auth")
-// @ManagerAuth(memo = "鏍规嵁璁㈠崟鍑哄簱")
+ @PostMapping("/order/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
return R.parse(BaseRes.PARAM);
}
- Integer staNo = param.containsKey("staNo") ? Integer.parseInt(param.get("staNo").toString()) : 0;
- String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : "";
-
- BasDevp sta = basDevpService.checkSiteStatus(staNo);
- //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。,寰呭疄鐜�
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
- for(OrderDetl orderDetl : orderDetls){
-
- }
-
-
-// if (Cools.isEmpty(locDtos)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// boolean lack = true;
-// for (LocDto locDto : locDtos) {
-// if (!locDto.isLack()) {
-// lack = false;
-// break;
-// }
-// }
-// if (lack) {
-// return R.error("搴撳瓨涓嶈冻");
-// }
-//
-// Thread.sleep(1000L);
-//
-// List<TaskDto> taskDtos = new ArrayList<>();
-// // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
-// for (LocDto locDto : locDtos) {
-// if (locDto.isLack()) { continue; }
-// TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
-// if (TaskDto.has(taskDtos, taskDto)) {
-// TaskDto dto = TaskDto.find(taskDtos, taskDto);
-// assert dto != null;
-// dto.getLocDtos().addAll(taskDto.getLocDtos());
-// } else {
-// taskDtos.add(taskDto);
-// }
-// }
-// // -----------------------------------------------------------------------------------------------
-// for (TaskDto taskDto : taskDtos) {
-// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
-// workService.stockOut(staNo, taskDto, getUserId());
-// }
- return R.ok();
+ mobileService.pakoutByOrder(param,getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
}
}
--
Gitblit v1.9.1