From 2bf957a2e0379386934491563f81c90ebceee143 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 12:44:05 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/MobileController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 100 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 1081145..b2ab2ba 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
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;
@@ -14,8 +13,8 @@
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;
@@ -23,7 +22,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -57,6 +55,14 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private WorkService workService;
private static Logger logger = LogManager.getLogger(MobileController.class);
@@ -155,7 +161,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
- logger.info("缁勬墭鍙傛暟锛歿}",combParam);
+ logger.info("缁勬墭鍙傛暟锛歿}", combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -171,10 +177,10 @@
@RequestMapping("/pickIn/auth")
// @ManagerAuth(memo="鐩樼偣鍏ュ簱")
- public R pickIn(@RequestParam String barcode){
+ public R pickIn(@RequestParam String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
- for(PickInParam pickInParam : param){
+ for (PickInParam pickInParam : param) {
pickInParam.setStaNo(wrkMast.getStaNo());
pickInParam.setWorkNo(wrkMast.getWrkNo());
}
@@ -485,5 +491,93 @@
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();
+ }
+
+ @RequestMapping("/combMeger/auth")
+ @ManagerAuth(memo = "骞舵澘")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam) {
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+ @RequestMapping("/empty/plate/out/start")
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("loc_type1", param.getType()).in("row1", 2, 3));
+ if (locMasts == null || locMasts.isEmpty()) {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("loc_type1", param.getType()).in("row1", 1, 4));
+ }
+ if (locMasts == null || locMasts.isEmpty()){
+ return R.error("鏃犵┖鏉垮簱浣�");
+ }
+ param.setOutSite(1103);
+ List<String> locNos = param.getLocNos();
+ if (locNos == null){
+ locNos = new ArrayList<>();
+ }
+ locNos.add(locMasts.get(0).getLocNo());
+ param.setLocNos(locNos);
+ workService.emptyPlateOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
}
--
Gitblit v1.9.1