From 995aeeda06e8e06a8880eb2e04e239cf03fada7c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 15:40:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8cfc49f..effe8ca 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -19,9 +19,7 @@
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
-import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
-import com.zy.nc.service.NccXsckmxTkWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -61,6 +59,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
@Autowired
private MatService matService;
@@ -74,9 +74,6 @@
@Autowired
private OrderDetlPakinService orderDetlPakinService;
-
- @Autowired
- private NccXsckmxTkWmsService nccXsckmxTkWmsService;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -290,12 +287,23 @@
@RequestMapping(value = "/mat/back")
@ManagerAuth
public R pdaSearchBack(@RequestParam String barcode) {
+ 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("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰�");
+ return R.error("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰曟槑缁�");
}
WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
@@ -313,7 +321,8 @@
matParam.setAnfme2(0.0D);
matParam.setTiaoma(batch);
- map.put("orderNo", wrkDetlLog.getOrderNo());
+ String[] split = wrkDetlLog.getOrderNo().split("-");
+ map.put("orderNo", split[0]);
map.put("matData", matParam);
return R.ok().add(map);
}
--
Gitblit v1.9.1