From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 634 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 572 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2ba4a5a..a3be010 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,23 +1,27 @@
package com.zy.asrs.controller;
+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;
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.*;
+import com.zy.asrs.entity.result.MobileAdjustResult;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.common.model.MobileLocDetlVo;
+import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
import java.util.List;
/**
@@ -37,6 +41,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private DocTypeService docTypeService;
@Autowired
private WrkMastService wrkMastService;
@@ -44,32 +50,371 @@
private WrkDetlService wrkDetlService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private PackService packService;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private OrderGiftService orderGiftService;
+ @Autowired
+ private OrderDetlGiftService orderDetlGiftService;
+
+
+ // 鍟嗗搧涓婃灦
+ @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("涓嬫灦鎴愬姛");
+ }
+
+ @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());
+ }
+
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
/**
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * 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) {
+ 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);
+ }
+ }
+ 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.selectorderNoLT(orderNo);
+ if (Cools.isEmpty(orders)){
return R.ok();
}
- if (order.getSettle() > 2) {
- 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);
+ }
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (Cools.isEmpty(orderDetls)) {
- return R.ok();
+ return R.ok().add(combParams);
+ }
+
+ @RequestMapping("/wrkDetl/search/batch/auth")
+ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
+ 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("鏈尮閰嶅埌鏄庣粏");
+ }
+ 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("鏈尮閰嶅埌鏄庣粏");
}
- return R.ok().add(orderDetls);
+ }
+
+ @RequestMapping("/order/search/batch/auth")
+ @ManagerAuth(memo = "鍑哄簱纭")
+ 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("鏈尮閰嶅埌鏄庣粏");
+ }
+ 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("鏈尮閰嶅埌鏄庣粏");
+ }
+ }
+
+// @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妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
+ 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){
+ 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);
}
@@ -80,18 +425,215 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/pack/get/auth")
+ @ManagerAuth
+ public R packGet(@RequestParam String barcode){
+ Pack pack = packService.selectByBarcode(barcode);
+ if (pack == null) {
+ return R.ok();
+ }
+ if (pack.getSettle() == 1L) {
+ return R.ok().add(pack);
+ }
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/pack/comb/auth")
+ @ManagerAuth(memo = "涓嬬嚎缁勬墭")
+ public R packComb(@RequestBody CombParam combParam){
+ mobileService.packComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+
+ // 鍑哄簱 ---------------------------------------------------------------------------------------------------
+
+ @RequestMapping("/pakout/query/auth")
+ @ManagerAuth
+ @Deprecated
+ public R pakoutQuery(@RequestParam(required = false) String barcode,
+ @RequestParam(required = false) Integer staNo,
+ @RequestParam(required = false) String matnr){
+ if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
+ return R.ok();
+ }
+ if (!Cools.isEmpty(barcode)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ return R.ok().add(wrkDetls);
+ }
+ if (!Cools.isEmpty(matnr)) {
+ if (!Cools.isEmpty(staNo)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
+ return R.ok().add(wrkDetls);
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱纭 - 鎵墭鐩樼爜
+ * 1.鍏ㄦ澘 杩斿洖 101
+ * 2.鎷ｆ枡 杩斿洖 103
+ */
+ @RequestMapping("/pakout/confirm/barcode/auth")
+ @ManagerAuth
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ if (Cools.isEmpty(barcode)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (wrkMast != null) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ // 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
+ wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
+ return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
+ }
+ 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));
+ }
+
+ /**
+ * 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
+ */
+ @RequestMapping("/pakout/confirm/pick/auth")
+ @ManagerAuth
+ public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
+ , @RequestParam(required = false) String matnr){
+ if (Cools.isEmpty(wrkNo)) {
+ return R.ok();
+ }
+ if (Cools.isEmpty(matnr)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast == null) {
+ return R.ok();
+ }
+ String orderNo = null;
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = wrkDetl.getOrderNo();
+ }
+ if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) {
+ return R.ok().add(wrkDetl);
+ }
+ }
+ // 鏇挎崲 鏄庣粏
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
+ for (LocDetl locDetl : locDetls) {
+ if ((locDetl.getMatnr() + "-" + locDetl.getBatch()).equals(matnr)) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setOrderNo(orderNo);
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setWrkNo(wrkNo);
+ return R.ok().add(wrkDetl);
+ }
+ }
+ return R.error("绯荤粺閿欒锛屾潯鐮佷笉瀛樺湪");
+ }
+
+
+ @RequestMapping("/pakout/confirm/auth")
+ @ManagerAuth
+ @Transactional
+ public R pakoutConfirm(@RequestBody List<WrkDetl> list) {
+ if (Cools.isEmpty(list)) {
+ return R.ok();
+ }
+ Set<Integer> wrkNos = new HashSet<>();
+ List<WrkDto> dtos = new ArrayList<>();
+ for (WrkDetl wrkDetl : list) {
+ if (wrkNos.contains(wrkDetl.getWrkNo())) {
+ for (WrkDto dto : dtos) {
+ if (dto.getWrkNo().equals(wrkDetl.getWrkNo())) {
+ dto.getWrkDetls().add(wrkDetl);
+ break;
+ }
+ }
+ } else {
+ wrkNos.add(wrkDetl.getWrkNo());
+ dtos.add(new WrkDto(wrkDetl.getWrkNo(), wrkDetl));
+ }
+ }
+
+ for (WrkDto dto : dtos) {
+ WrkMast wrkMast = wrkMastService.selectById(dto.getWrkNo());
+ if (wrkMast != null) {
+ // 101
+ if (wrkMast.getIoType() == 101) {
+ for (WrkDetl wrkDetl : dto.getWrkDetls()) {
+ wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ }
+ }
+ // 103
+ if (wrkMast.getIoType() == 103) {
+ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ }
+ for (WrkDetl wrkDetl : dto.getWrkDetls()) {
+ wrkDetl.setInspect(1);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ }
+ }
+ }
+ }
+ }
+
+ for (Integer wrkNo : wrkNos) {
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+ boolean complete = true;
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl.getInspect() == null || wrkDetl.getInspect() == 0) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ wrkMast.setInvWh("Y");
+ wrkMast.setModiTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇敼宸ヤ綔妗�" + wrkNo + "澶辫触");
+ }
+ }
+ }
+ }
+ return R.ok("瀹屾垚纭");
+ }
+
+
// 鐩樼偣 ----------------------------------------------------------------------------------------------------
@RequestMapping("/checkDetl/auth")
@ManagerAuth
- public R getCheckDetl(@RequestParam Integer staNo) {
+ public R getCheckDetl(@RequestParam(required = false) Integer staNo) {
+ if (null == staNo || staNo == 0) {
+ return R.ok();
+ }
BasDevp basDevp = basDevpService.selectById(staNo);
if (null != basDevp && basDevp.getWrkNo() != null) {
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
if (wrkMast != null && wrkMast.getIoType() == 107) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (!Cools.isEmpty(wrkDetls)) {
- return R.ok().add(wrkDetls);
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setStaNo(staNo);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
}
}
}
@@ -102,49 +644,17 @@
@ManagerAuth(memo = "鐩樼偣")
public R adjust(@RequestBody MobileAdjustParam combParam){
mobileService.adjust(combParam, getUserId());
- return R.ok();
+ return R.ok("鐩樼偣鎴愬姛");
}
-
- /**
- * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
- */
- @RequestMapping("/locDetl")
- @ManagerAuth
- public R getLocDetl(@RequestParam(required = false)String locNo,
- @RequestParam(required = false)String matNo){
- if (!Cools.isEmpty(locNo)) {
- LocMast locMast = locMastService.selectById(locNo);
- if (null == locMast || !"F".equals(locMast.getLocSts())) {
- return R.parse(BaseRes.EMPTY);
- }
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("loc_no", locNo).orderBy("appe_time", false));
- List<MobileLocDetlVo> res = new ArrayList<>();
- locDetls.forEach(locDetl -> {
- MobileLocDetlVo vo = new MobileLocDetlVo();
- vo.setLocNo(locDetl.getLocNo());
- vo.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
- res.add(vo);
- });
- return R.ok().add(res);
+ @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);
}
- if (!Cools.isEmpty(matNo)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("matnr", matNo).orderBy("appe_time", false));
- List<MobileLocDetlVo> res = new ArrayList<>();
- locDetls.forEach(locDetl -> {
- MobileLocDetlVo vo = new MobileLocDetlVo();
- vo.setLocNo(locDetl.getLocNo());
- vo.setMatnr(locDetl.getMatnr());
- vo.setMaktx(locDetl.getMaktx());
- vo.setCount(locDetl.getAnfme());
- res.add(vo);
- });
- return R.ok().add(res);
- }
- return R.parse(BaseRes.PARAM);
+ mobileService.pakoutByOrder(param,getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
}
+
}
--
Gitblit v1.9.1