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 | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index ed483cf..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;
@@ -9,6 +13,7 @@
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,16 +42,16 @@
private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
/*
locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
*/
@PostMapping("/comb/auth")
- public R comb(@RequestBody List<CombParam> combParams){
- combParams.forEach(combParam -> {
- agvMobileService.comb(combParam, getUserId());
- });
+ public R comb(@RequestBody CombParam combParam){
+ agvMobileService.comb(combParam, getUserId());
return R.ok();
}
@@ -105,11 +110,14 @@
*/
@PostMapping("/start/pakin/auth")
@Synchronized
+ @Transactional
public R startPakin(@RequestBody AgvMobileStartPakin params){
// 缁勬墭
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("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
@@ -155,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