From 1d895bd129a141f308d2ed4c4caaab55d2db104b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 15:10:35 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/MobileController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 254b39c..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;
@@ -16,7 +15,6 @@
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;
@@ -24,7 +22,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -64,6 +61,8 @@
private MatBarcodeService matBarcodeService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private WorkService workService;
private static Logger logger = LogManager.getLogger(MobileController.class);
@@ -162,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());
}
@@ -178,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());
}
@@ -496,26 +495,26 @@
@ManagerAuth(memo = "PDA鍛煎彨鎵樼洏鍑哄簱")
public R callBarcode(@RequestBody CombParam combParam) {
logger.info("PDA鍛煎彨鎵樼洏鍑哄簱");
- if (combParam == null){
+ if (combParam == null) {
return R.parse(BaseRes.PARAM);
}
combParam.getCombMats().forEach(combMat -> {
Mat mat = matService.selectByMatnr(combMat.getMatnr());
- if (mat == null){
+ if (mat == null) {
throw new CoolException("鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
MatBarcode matBarcode = matBarcodeService.selectbyMatnr(combMat.getMatnr());
- if (matBarcode == null){
+ if (matBarcode == null) {
throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
}
- LocMast locMast=locMastService.selectByBarcode(matBarcode.getZpallet());
- if (locMast == null){
+ LocMast locMast = locMastService.selectByBarcode(matBarcode.getZpallet());
+ if (locMast == null) {
throw new CoolException("鏈壘鍒颁笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏");
}
- int wrkNo=commonService.getWorkNo(0);
+ int wrkNo = commonService.getWorkNo(0);
Date now = new Date();
//鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast=new WrkMast();
+ WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(wrkNo);
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L);//宸ヤ綔鐘舵�侊細鐢熸垚鍑哄簱ID
@@ -552,4 +551,33 @@
});
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