From f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 20:07:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 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 36d8afe..2af50aa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -22,7 +22,6 @@
import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import com.zy.nc.service.NccXsckmxTkWmsService;
-import org.mybatis.spring.annotation.MapperScannerRegistrar;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -78,8 +77,6 @@
@Autowired
private NccXsckmxTkWmsService nccXsckmxTkWmsService;
- @Autowired
- private MapperScannerRegistrar mapperScannerRegistrar;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -295,18 +292,36 @@
public R pdaSearchBack(@RequestParam String matnr) {
EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
wrapper.like("VBATCHCODE", matnr);
- NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
- if (null == nccXsckmxTkWms) {
+ List<NccXsckmxTkWms> nccXsckmxTkWmsList = nccXsckmxTkWmsService.selectList(wrapper);
+ if (nccXsckmxTkWmsList.isEmpty()) {
return R.error("鏈壘鍒版鏉＄爜");
}
- Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
- MatParam matParam = new MatParam();
- Synchro.Copy(mat, matParam);
- matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
- matParam.setAnfme(0.0D);
- matParam.setAnfme2(0.0D);
- matParam.setTiaoma(matnr);
- return R.ok().add(matParam);
+
+ List<String> orderNos = new ArrayList<>();
+ List<HashMap<String, Object>> list = new ArrayList<>();
+ for (NccXsckmxTkWms nccXsckmxTkWms : nccXsckmxTkWmsList) {
+ if (orderNos.contains(nccXsckmxTkWms.getVsourcebillcode())) {
+ continue;
+ }
+ orderNos.add(nccXsckmxTkWms.getVsourcebillcode());
+ HashMap<String, Object> map = new HashMap<>();
+
+ Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
+ if (mat == null) {
+ continue;
+ }
+ MatParam matParam = new MatParam();
+ Synchro.Copy(mat, matParam);
+ matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
+ matParam.setAnfme(0.0D);
+ matParam.setAnfme2(0.0D);
+ matParam.setTiaoma(matnr);
+
+ map.put("orderNo", nccXsckmxTkWms.getVsourcebillcode());
+ map.put("matData", matParam);
+ list.add(map);
+ }
+ return R.ok().add(list);
}
@RequestMapping("/comb/auth")
--
Gitblit v1.9.1