From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/MobileController.java | 776 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 715 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5ba3f32..f6b706f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,26 +1,36 @@
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.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.MobileService;
-import com.zy.common.model.MobileLocDetlVo;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+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.asrs.utils.MathUtils;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.model.WrkDto;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
+import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.entity.NccQilibcTmprintWms;
+import com.zy.nc.entity.NccSaleXclGgsybWms;
+import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
+import com.zy.nc.service.NccQilibcTmprintWmsService;
+import com.zy.nc.service.NccSaleXclGgsybWmsService;
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 java.util.List;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -28,7 +38,7 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -36,67 +46,711 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private PackService packService;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private StoreTypeService storeTypeService;
+
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private NccJcQilibcBarcodeflowWmsService nccJcQilibcBarcodeflowWmsService;
+ @Autowired
+ private NccQilibcTmprintWmsService nccQilibcTmprintWmsService;
+ @Autowired
+ private NccSaleXclGgsybWmsService nccSaleXclGgsybWmsService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @Resource
+ private StaDescService staDescService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+
+ @RequestMapping("/pda/WarehouseOut/v1")
+ @ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
+ public R WarehouseOutV1(@RequestBody CombParam combParam) {
+ return mobileService.WarehouseOutV1(combParam, getHostId(), getUserId());
+ }
+
+ @RequestMapping("/pda/WarehouseOutPickMerge/v1")
+ @ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
+ public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
+ if (Cools.isEmpty(param, param.getLocNo(), param.getBarcode(), param.getCombMats())) {
+ return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
+ }
+
+ @RequestMapping("/pick/in")
+ @ManagerAuth(memo = "骞舵澘鍏ュ簱")
+ public R pickConfirm(@RequestBody PickConfirmParam param) {
+
+ if (Cools.isEmpty(param, param.getList(), param.getLocNo(), param.getStaNo())) {
+ return R.parse("鍙傛暟涓嶅畬鏁�");
+ }
+ return mobileService.pickConfirm(param, getUserId());
+ }
+
+ @RequestMapping("/barcode/list/all")
+ @ManagerAuth(memo = "骞舵澘鍏ュ簱閫斾腑鎷ｆ枡鍑哄簱鑾峰彇浠诲姟淇℃伅")
+ public R orderOutListOrder(@RequestParam(required = false) String barcode) {
+ return mobileService.orderOutListOrder(barcode, getUserId());
+ }
+
+ @RequestMapping("/barcode/list/pick")
+ @ManagerAuth(memo = "鎷ｆ枡鍏ュ簱閫斾腑骞舵澘鑾峰彇浠诲姟淇℃伅")
+ public R orderOutListOrderPick(@RequestParam(required = false) String barcode) {
+ return mobileService.orderOutListOrderPick(barcode, getUserId());
+ }
+
+ @RequestMapping("/loc/f/list")
+ @ManagerAuth(memo = "鑾峰彇鍦ㄥ簱搴撲綅")
+ public R locNoF(@RequestParam(required = false) String locNo) {
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F");
+ if (!Cools.isEmpty(locNo)) {
+ wrapper.like("loc_no", locNo);
+ }
+ List<LocMast> list = locMastService.selectList(wrapper);
+ return R.ok().add(list);
+ }
+
+ @RequestMapping("/pick/sta/list")
+ @ManagerAuth(memo = "鑾峰彇骞舵澘绔�")
+ public R pickSta() {
+ List<StaDesc> list = staDescService.selectList(new EntityWrapper<StaDesc>()
+ .eq("type_no", 104));
+ return R.ok().add(list);
+ }
+
+ @RequestMapping("/pick/mat/list")
+ @ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
+ public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
+ return mobileService.pickMats(matnr, orderNo);
+ }
+
+ // 鍟嗗搧涓婃灦
+ @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("涓嬫灦鎴愬姛");
+ }
+
+
+ // 缁勬墭 ----------------------------------------------------------------------------------------------------
/**
- * 缁勬墭
+ * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
+ * 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) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
+ }
+ List<OrderPakin> orderPakins = orderPakinService.selectorderNoL(orderNo);
+ //List<Order> orders = OrderInAndOutUtil.selectOrderNoL(OrderEnumVo.PAKIN.getCode(), orderNo);
+ if (Cools.isEmpty(orderPakins)) {
+ return R.ok();
+ }
+ LinkedList<CombParam> combParams = new LinkedList<>();
+ if (!Cools.isEmpty(orderPakins)) {
+ for (OrderPakin order : orderPakins) {
+ 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());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ CombParam.CombMat combMat = new CombParam.CombMat();
+ Synchro.Copy(orderDetl, combMat);
+ combMat.setMatnr(orderDetl.getMatnr());
+ combMat.setBatch(orderDetl.getBatch());
+ combMat.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setEnableQty(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
+ combMats.add(combMat);
+ }
+ combParam.setCombMats(combMats);
+ }
+ //combParam.setOrderNo(order.getOrderNo());
+ combParams.add(combParam);
+ }
+ }
+ return R.ok().add(combParams.get(0));
+ }
+
+ @RequestMapping(value = "/mat/search/auth")
+ @ManagerAuth
+ public R pdaSearchV2(@RequestParam String matnr) {
+ EntityWrapper<NccJcQilibcBarcodeflowWms> wrapper = new EntityWrapper<>();
+ wrapper.eq("VBARCODE", matnr).orderBy("ts", false);
+ NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms = nccJcQilibcBarcodeflowWmsService.selectOne(wrapper);
+ if (null == nccJcQilibcBarcodeflowWms) {
+ return R.error("鏈壘鍒版鏉＄爜");
+ } else {
+ if (!nccJcQilibcBarcodeflowWms.getInfla().equals("鍑哄簱")) {
+ return R.error("璇ユ潯鐮佹渶鍚庝竴娆′笉鏄嚭搴�");
+ }
+ }
+ Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>().eq("order_no", nccJcQilibcBarcodeflowWms.getZkdh()).eq("matnr", mat.getMatnr()).eq("batch", nccJcQilibcBarcodeflowWms.getVbatchcode()));
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒版鍗曞彿");
+ }
+ matParam.setStandby1(orderDetlPakin.getStandby1());
+ matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
+ matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
+ matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
+ matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
+ matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
+ matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
+ matParam.setCstateid(nccJcQilibcBarcodeflowWms.getCstateid());
+ return R.ok().add(matParam);
+
+ }
+
+ @RequestMapping(value = "/mat/auth")
+ @ManagerAuth
+ public R pdaSearchV3(@RequestParam String matnr) {
+ EntityWrapper<NccQilibcTmprintWms> wrapper = new EntityWrapper<>();
+ wrapper.eq("BARCODE", matnr).orderBy("PRINTTIME", false);
+ NccQilibcTmprintWms nccQilibcTmprintWms = nccQilibcTmprintWmsService.selectOne(wrapper);
+ if (null == nccQilibcTmprintWms) {
+ return R.error("鏈壘鍒版鏉＄爜");
+ }
+ Mat mat = matService.selectByMatnr(nccQilibcTmprintWms.getWlbm());
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ matParam.setBatch(nccQilibcTmprintWms.getVbatchcode());
+// matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
+// matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
+ matParam.setAnfme(0.0D);
+ matParam.setAnfme2(0.0D);
+ matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
+ matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
+ matParam.setCstateid(nccQilibcTmprintWms.getCstateid());
+ return R.ok().add(matParam);
+ }
+
+ @RequestMapping(value = "/mat/back")
+ @ManagerAuth
+ public R pdaSearchBack(@RequestParam String barcode) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", barcode)
+ .in("io_type", 101, 103, 107, 53, 57)
+ .orderBy("appe_time", false)
+ );
+
+ String matnr = null;
+ String batch = null;
+ String cstateid = null;
+ String standby1 = null;
+ String orderNo = null;
+
+ if(wrkMast != null) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", wrkMast.getWrkNo())
+ .eq("zpallet", barcode)
+ .orderBy("io_time", false)
+ );
+ if (wrkDetls.isEmpty()) {
+ return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰曟槑缁�");
+ }
+
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ matnr = wrkDetl.getMatnr();
+ batch = wrkDetl.getBatch();
+ cstateid = wrkDetl.getCstateid();
+ standby1 = wrkDetl.getStandby1();
+ orderNo = wrkDetl.getOrderNo();
+ }
+
+ if(matnr == null) {
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>()
+ .eq("barcode", barcode)
+ .in("io_type", 101, 103, 107)
+ .orderBy("appe_time", false)
+ );
+
+ if(null == wrkMastLog) {
+ return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰�");
+ }
+
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
+ .eq("wrk_no", wrkMastLog.getWrkNo())
+ .eq("zpallet", barcode)
+ .orderBy("io_time", false)
+ );
+ if (wrkDetlLogs.isEmpty()) {
+ return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰曟槑缁�");
+ }
+
+ WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
+
+ matnr = wrkDetlLog.getMatnr();
+ batch = wrkDetlLog.getBatch();
+ cstateid = wrkDetlLog.getCstateid();
+ standby1 = wrkDetlLog.getStandby1();
+ orderNo = wrkDetlLog.getOrderNo();
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ Mat mat = matService.selectByMatnr(matnr);
+ if (mat == null) {
+ return R.error("鏈壘鍒扮墿鏂欐槑缁�");
+ }
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ matParam.setBatch(batch);
+ matParam.setAnfme(0.0D);
+ matParam.setAnfme2(0.0D);
+ matParam.setTiaoma(batch);
+ matParam.setCstateid(cstateid);
+ matParam.setStandby1(standby1);
+
+ String[] split = orderNo.split("-");
+ map.put("orderNo", split[0]);
+ map.put("matData", matParam);
+ return R.ok().add(map);
+ }
+
+ @RequestMapping("/comb/cancel")
+ @ManagerAuth(memo = "鍙栨秷缁勬墭")
+ public R combCancel(@RequestBody CombCancelParam param) {
+ mobileService.combCancel(param, getUserId());
+ return R.ok("鍙栨秷缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
- return R.ok();
+ return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/comb2/auth")
+ @ManagerAuth(memo = "閲囪喘缁勬墭")
+ public R comb2(@RequestBody CombParam combParam) {
+ CombParam.CombMat combMat = combParam.getCombMats().get(0);
- /**
- * 缁勬墭
- */
- @RequestMapping("/comb/form")
- @ManagerAuth(memo = "缁勬墭")
- public R combForm(@RequestParam CombParam combParam){
+ ArrayList<String> ckbmList = new ArrayList<>();
+ List<StoreType> storeTypes = storeTypeService.selectList(new EntityWrapper<StoreType>()
+ .like("store_name", "绔嬩綋搴�"));
+ for (StoreType storeType : storeTypes) {
+ ckbmList.add(storeType.getStoreId());
+ }
+
+// NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
+// .eq("WLBM", combMat.getMatnr())
+// .eq("VBATCHCODE", combMat.getBatch())
+// .in("CKBM", ckbmList)
+// );
+// if(null == nccSaleXclGgsybWms) {
+// return R.error("鏈煡鍒癊RP搴撳瓨");
+// }
+//
+// //ERP搴撳瓨鏁伴噺
+// BigDecimal zsl = nccSaleXclGgsybWms.getZsl();
+//
+// //鑾峰彇绔嬪簱鏁伴噺
+// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("matnr", combMat.getMatnr())
+// .eq("batch", combMat.getBatch())
+// );
+// BigDecimal stockNum = new BigDecimal(0);
+// for (LocDetl locDetl : locDetls) {
+// stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
+// }
+//
+// //鍔犱笂缁勬墭鏁伴噺
+// for (CombParam.CombMat mat : combParam.getCombMats()) {
+// stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
+// }
+//
+// if(stockNum.doubleValue() > zsl.doubleValue()) {
+// return R.error("缁勬墭鏁伴噺瓒呰繃ERP搴撳瓨");
+// }
+//
+// List<CombParam.CombMat> combMats = combParam.getCombMats();
+// for (CombParam.CombMat mat : combMats) {
+// mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
+// }
+
mobileService.comb(combParam, getUserId());
- return R.ok();
+ return R.ok("缁勬墭鎴愬姛");
}
- /**
- * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
- */
- @RequestMapping("/locDetl")
+ @RequestMapping("/pack/get/auth")
@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);
+ public R packGet(@RequestParam String barcode) {
+ Pack pack = packService.selectByBarcode(barcode);
+ if (pack == null) {
+ return R.ok();
}
- 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);
+ if (pack.getSettle() == 1L) {
+ return R.ok().add(pack);
}
- return R.parse(BaseRes.PARAM);
+ 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();
+ }
+
+ /**
+ * 鍑哄簱纭 - 鎵揣鐗� 骞垮痉瀹滅鐗�
+ * 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()));
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
+ List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+ OrderDetl orderDetl = null;
+ for (OrderDetl orderDetl1 : orderDetlList) {
+ if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())) {
+ orderDetl = orderDetl1;
+ break;
+ }
+ }
+ if (Cools.isEmpty(orderDetl)) {
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+// orderDetlService.updateById(orderDetl);
+ OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE, order, 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));
+ }
+
+ /**
+ * 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
+ */
+ @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(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)) {
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setStaNo(staNo);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/checkDetl/auth/v2")
+ @ManagerAuth
+ public R getCheckDetlV2(@RequestParam(required = false) String barcode) {
+ if (Cools.isEmpty(barcode)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (wrkMast != null && (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 57)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (!Cools.isEmpty(wrkDetls)) {
+ MobileAdjustResult result = new MobileAdjustResult();
+ result.setBarcode(barcode);
+ result.setWrkNo(wrkMast.getWrkNo());
+ result.setWrkDetls(wrkDetls);
+ return R.ok().add(result);
+ }
+ }
+ return R.ok();
+ }
+
+
+ @RequestMapping("/adjust/auth")
+ @ManagerAuth(memo = "鐩樼偣")
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
+ mobileService.adjust(combParam, getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+ @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);
+ }
+ mobileService.pakoutByOrder(param, getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @RequestMapping("/checkOut/submit/auth")
+ @ManagerAuth(memo = "鐩樼偣涓婃姤ERP")
+ public R checkOutSubmit(@RequestParam("orderId") Integer orderId) {
+ mobileService.checkOutSubmit(orderId, getUserId());
+ return R.ok("涓婃姤ERP鎴愬姛");
+ }
+
+ @RequestMapping("/pallet/toOutSta")
+ @ManagerAuth(memo = "鎵樼洏鍘诲嚭搴撳彛")
+ public R toOutSta(@RequestBody PalletToOutStaParam param) {
+ mobileService.toOutSta(param, getUserId());
+ return R.ok();
+ }
+
+ @RequestMapping("/pallet/toAllOut")
+ @ManagerAuth(memo = "鎷ｆ枡杞叏鏉�")
+ public R toAllOut(@RequestBody PalletToAllOutParam param) {
+ mobileService.toAllOut(param, getUserId());
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1