From 58652618b0776f3ebe271c6a0f585e4a0dc60877 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 25 九月 2025 16:43:16 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/MobileController.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e739ef9..254b39c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,15 +9,16 @@
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.GDYKConfirmGoodsParam;
-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.WrkDto;
+import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.license.AbstractServerInfos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -57,7 +58,15 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
+ @Autowired
+ private CommonService commonService;
+
+ private static Logger logger = LogManager.getLogger(MobileController.class);
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -136,10 +145,13 @@
combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setDetId(orderDetl.getDetId());
+ combMat.setDetlId(orderDetl.getId());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
+ combParam.setBillNo(order.getOrderNo());
combParam.setOrderNo(order.getOrderNo());
combParams.add(combParam);
}
@@ -150,6 +162,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
+ logger.info("缁勬墭鍙傛暟锛歿}",combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -162,6 +175,19 @@
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+
+ @RequestMapping("/pickIn/auth")
+// @ManagerAuth(memo="鐩樼偣鍏ュ簱")
+ public R pickIn(@RequestParam String barcode){
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
+ for(PickInParam pickInParam : param){
+ pickInParam.setStaNo(wrkMast.getStaNo());
+ pickInParam.setWorkNo(wrkMast.getWrkNo());
+ }
+ return R.ok().add(param);
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
@@ -429,7 +455,7 @@
if (temp1 == null) {
throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
}
- List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
+ List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
if (waitMatins == null || waitMatins.isEmpty()) {
throw new CoolException("璇ヨ鍗曢」涓嶅瓨鍦�");
}
@@ -466,5 +492,64 @@
return R.ok().add(vos);
}
-
+ @RequestMapping("/callBarcode")
+ @ManagerAuth(memo = "PDA鍛煎彨鎵樼洏鍑哄簱")
+ public R callBarcode(@RequestBody CombParam combParam) {
+ logger.info("PDA鍛煎彨鎵樼洏鍑哄簱");
+ if (combParam == null){
+ return R.parse(BaseRes.PARAM);
+ }
+ combParam.getCombMats().forEach(combMat -> {
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ if (mat == null){
+ throw new CoolException("鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ MatBarcode matBarcode = matBarcodeService.selectbyMatnr(combMat.getMatnr());
+ if (matBarcode == null){
+ throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
+ }
+ LocMast locMast=locMastService.selectByBarcode(matBarcode.getZpallet());
+ if (locMast == null){
+ throw new CoolException("鏈壘鍒颁笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏");
+ }
+ int wrkNo=commonService.getWorkNo(0);
+ Date now = new Date();
+ //鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast=new WrkMast();
+ wrkMast.setWrkNo(wrkNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(11L);//宸ヤ綔鐘舵�侊細鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(101);//鍏ュ嚭搴撶姸鎬侊細骞舵澘鍑哄簱
+ wrkMast.setIoPri(13D);//浼樺厛绾�
+ wrkMast.setCrnNo(locMast.getCrnNo());
+// wrkMast.setSourceStaNo(dto.getSourceStaNo());//婧愮珯
+ wrkMast.setStaNo(101);// 鐩爣绔�
+ wrkMast.setSourceLocNo(locMast.getLocNo());// 婧愬簱浣�
+ wrkMast.setBarcode(matBarcode.getZpallet()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+// wrkMast.setScWeight(weight);
+ wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts("R"); // R.鍑哄簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(locMast.getLocNo() + "鐩爣搴撲綅鐘舵�佷笉涓篎");
+ }
+ });
+ return R.ok();
+ }
}
--
Gitblit v1.9.1