From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/MobileController.java | 227 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 179 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c832de4..102aa24 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,14 +9,10 @@
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.OffSaleParam;
+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.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;
@@ -24,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -55,21 +52,23 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_mat_on_sale")
public R matOnSale(@RequestBody CombParam combParam){
mobileService.onSale(combParam);
- return R.ok("涓婃灦鎴愬姛");
+ return R.ok("response.on_sale_success");
}
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
//@ManagerAuth
public R matOffSale(@RequestBody OffSaleParam offSaleParam){
mobileService.offSale(offSaleParam);
- return R.ok("涓嬫灦鎴愬姛");
+ return R.ok("response.off_sale_success");
}
@@ -80,59 +79,154 @@
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
* 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().put("data", orderDetls);
+// }
@RequestMapping("/order/search/orderNo/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_order_search")
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);
+ R r = R.ok();
+ r.put("data",combParams);
+ return r;
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "response.pallet_comb")
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("response.comb_success");
}
+ @RequestMapping("/cartonComb/auth")
+ @ManagerAuth(memo = "response.pallet_comb")
+ public R cartonComb(@RequestBody List<CombCartonParam> params ){
+ mobileService.cartonComb(params, getUserId());
+ return R.ok("response.comb_success");
+ }
+
+ @RequestMapping("/cartonScanReplace/auth")
+ @ManagerAuth(memo = "response.carton_scan")
+ public R cartonScanReplace(@RequestBody ScanParam scanParam){
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode",scanParam.getCartonLabel()));
+ if (wrkDetls.isEmpty()) {
+ return R.error("response.no_data");
+ }
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ return R.ok("response.scan_success").add(wrkDetl);
+
+ }
+ @RequestMapping("/labelReplace/auth")
+ @ManagerAuth(memo = "response.carton_scan_save")
+ public R cartonScanReplaceSave(@RequestBody ReplaceBarcodeParam replaceBarcodeParam) {
+ if (replaceBarcodeParam == null || Cools.isEmpty(replaceBarcodeParam.getReplaceParam())) {
+ return R.error("PARAM IS NULL");
+ }
+ for (ReplaceBarcodeParam.CombinedData param : replaceBarcodeParam.getReplaceParam()) {
+ WrkDetl wrkDetl = wrkDetlService.selectOne(
+ new EntityWrapper<WrkDetl>()
+ .eq("order_no", param.getOrderNo())
+ .eq("barcode", param.getBarcode())
+ );
+ if (wrkDetl == null) {
+ return R.error("DETL IS NULL, barcode=" + param.getBarcode());
+ }
+ if (!wrkDetlService.updateBuyerLabel(param.getOrderNo(), param.getBuyerLabelBarcode(),param.getBarcode())) {
+ return R.error("Failed to update, barcode=" + param.getBarcode());
+ }
+ }
+ return R.ok("response.replace_success");
+ }
+
+
+ @RequestMapping("/cartonScan/auth")
+ @ManagerAuth(memo = "response.carton_scan")
+ public R cartonScan(@RequestBody ScanParam scanParam){
+ OrderDetl orderDetl = mobileService.cartonScan(scanParam, getUserId());
+ return R.ok("response.scan_success").add(orderDetl);
+ }
@RequestMapping("/pack/get/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_pack_get")
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);
+ R r = R.ok();
+ r.put("data",pack);
+ return r;
}
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("response.comb_success");
}
@RequestMapping("/pack/comb/auth")
- @ManagerAuth(memo = "涓嬬嚎缁勬墭")
+ @ManagerAuth(memo = "response.offline_pallet_comb")
public R packComb(@RequestBody CombParam combParam){
mobileService.packComb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("response.comb_success");
}
// 鍑哄簱 ---------------------------------------------------------------------------------------------------
@RequestMapping("/pakout/query/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_pakout_query")
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
@@ -142,12 +236,16 @@
}
if (!Cools.isEmpty(barcode)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
- return R.ok().add(wrkDetls);
+ R r = R.ok();
+ r.put("data",wrkDetls);
+ return r;
}
if (!Cools.isEmpty(matnr)) {
if (!Cools.isEmpty(staNo)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
- return R.ok().add(wrkDetls);
+ R r = R.ok();
+ r.put("data",wrkDetls);
+ return r;
}
}
return R.ok();
@@ -159,7 +257,7 @@
* 2.鎷ｆ枡 杩斿洖 103
*/
@RequestMapping("/pakout/confirm/barcode/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_pakout_confirm_barcode")
public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
if (Cools.isEmpty(barcode)) {
return R.ok();
@@ -169,8 +267,35 @@
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));
+ R r = R.ok();
+ r.put("data", Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
+ return r;
}
+ 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("response.data_not_found");
+ }
+ if (!orderDetl.getAnfme().equals(orderDetl.getQty())){
+ return R.error("response.task_not_completed");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
return R.ok();
}
@@ -188,7 +313,7 @@
* 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
*/
@RequestMapping("/pakout/confirm/pick/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.mobile_pakout_confirm_pick")
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
, @RequestParam(required = false) String matnr){
if (Cools.isEmpty(wrkNo)) {
@@ -208,7 +333,9 @@
orderNo = wrkDetl.getOrderNo();
}
if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) {
- return R.ok().add(wrkDetl);
+ R r = R.ok();
+ r.put("data",wrkDetl);
+ return r;
}
}
// 鏇挎崲 鏄庣粏
@@ -220,10 +347,12 @@
wrkDetl.setOrderNo(orderNo);
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setWrkNo(wrkNo);
- return R.ok().add(wrkDetl);
+ R r = R.ok();
+ r.put("data",wrkDetl);
+ return r;
}
}
- return R.error("绯荤粺閿欒锛屾潯鐮佷笉瀛樺湪");
+ return R.error("response.system_error_barcode_not_exist");
}
@@ -262,12 +391,12 @@
// 103
if (wrkMast.getIoType() == 103) {
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
- throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ throw new CoolException("response.confirm_picking_outbound_failed");
}
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
wrkDetl.setInspect(1);
if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ throw new CoolException("response.confirm_picking_outbound_failed");
}
}
}
@@ -289,12 +418,12 @@
wrkMast.setInvWh("Y");
wrkMast.setModiTime(new Date());
if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("淇敼宸ヤ綔妗�" + wrkNo + "澶辫触");
- }
+ throw new CoolException("response.modify_work_master_failed");
+ }
}
}
}
- return R.ok("瀹屾垚纭");
+ return R.ok("response.confirm_complete");
}
@@ -316,7 +445,9 @@
result.setStaNo(staNo);
result.setWrkNo(wrkMast.getWrkNo());
result.setWrkDetls(wrkDetls);
- return R.ok().add(result);
+ R r = R.ok();
+ r.put("data",result);
+ return r;
}
}
}
@@ -324,20 +455,20 @@
}
@RequestMapping("/adjust/auth")
- @ManagerAuth(memo = "鐩樼偣")
+ @ManagerAuth(memo = "response.stock_count")
public R adjust(@RequestBody MobileAdjustParam combParam){
mobileService.adjust(combParam, getUserId());
- return R.ok("鐩樼偣鎴愬姛");
+ return R.ok("response.stock_adjust_success");
}
@PostMapping("/order/out/pakout/auth")
- @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ @ManagerAuth(memo = "response.order_outbound")
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("鍑哄簱鎴愬姛");
+ return R.ok("response.outbound_success");
}
}
--
Gitblit v1.9.1