From 1ea41a22eadfb3eef3d434bef7d2efff3bae331c Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期日, 15 六月 2025 17:18:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index f14d0be..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 = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -289,21 +286,45 @@
@RequestMapping(value = "/mat/back")
@ManagerAuth
- public R pdaSearchBack(@RequestParam String matnr) {
- EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
- wrapper.like("VBATCHCODE", matnr);
- NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
- if (null == nccXsckmxTkWms) {
- return R.error("鏈壘鍒版鏉＄爜");
+ 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("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰�");
}
- Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
+
+ 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("鏈壘鍒版鎵樼洏鐮佸嚭搴撹褰曟槑缁�");
+ }
+
+ WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
+ String batch = wrkDetlLog.getBatch();
+
+ HashMap<String, Object> map = new HashMap<>();
+ Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+ if (mat == null) {
+ return R.error("鏈壘鍒扮墿鏂欐槑缁�");
+ }
MatParam matParam = new MatParam();
Synchro.Copy(mat, matParam);
- matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
+ matParam.setBatch(batch);
matParam.setAnfme(0.0D);
matParam.setAnfme2(0.0D);
- matParam.setTiaoma(matnr);
- return R.ok().add(matParam);
+ matParam.setTiaoma(batch);
+
+ String[] split = wrkDetlLog.getOrderNo().split("-");
+ map.put("orderNo", split[0]);
+ map.put("matData", matParam);
+ return R.ok().add(map);
}
@RequestMapping("/comb/auth")
--
Gitblit v1.9.1