From 4dbb96434dceef64f00cc118853e131b04bf6ba1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 四月 2024 14:12:25 +0800
Subject: [PATCH] 根据入库单与销售单查询库存
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index f59f308..6a08d79 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,7 +1,11 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
@@ -38,6 +42,8 @@
private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
/*
@@ -107,15 +113,11 @@
@Transactional
public R startPakin(@RequestBody AgvMobileStartPakin params){
// 缁勬墭
- try {
- params.getCombParams().forEach(combParam -> {
- agvMobileService.comb(combParam,getUserId());
- });
- params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
- } catch (Exception e) {
- return R.error("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
- }
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam,getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
@@ -161,6 +163,24 @@
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v1")
+ public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("order_no", orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+
+ return R.ok(agvLocDetls);
+ }
}
--
Gitblit v1.9.1