From 3c1e34e86e18224acf34883039f7c31cab5a3d4d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 19 九月 2023 16:28:44 +0800
Subject: [PATCH] 平库增加
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 736601e..c55a5d6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
@@ -43,14 +44,25 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
- if(Cools.isEmpty(batch)){
- wrapper.isNull("batch");
- }else {
- wrapper.eq("batch",batch);
- }
+
+ wapperSetCondition(wrapper,"batch",batch);
+ wapperSetCondition(wrapper,"three_code",csocode);
+ wapperSetCondition(wrapper,"dead_time",isoseq);
+
+// if(Cools.isEmpty(batch)){
+// wrapper.isNull("batch");
+// }else {
+// wrapper.eq("batch",batch);
+// }
+// if(!Cools.isEmpty(csocode)){
+// wrapper.eq("three_code",csocode);
+// }
+// if(Cools.isEmpty(isoseq)){
+// wrapper.eq("dead_time",isoseq);
+// }
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
for (AgvLocDetl agvLocDetl: agvLocDetls) {
@@ -80,6 +92,53 @@
}
+ /*
+ 鏇存柊搴撳瓨鏄庣粏
+ */
+ public void updateStock(String sourceLoc, String targetLoc) {
+ this.baseMapper.updateStock(sourceLoc,targetLoc);
+ }
+
+ public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+ }
+
+ /*
+ 鑾峰彇搴撳瓨鎬绘暟
+ */
+ public Integer sum() {
+ return this.baseMapper.sum();
+ }
+
+ public List<AgvLocDetl> getStockStatisExcel(){
+ return this.baseMapper.getStockStatisExcel();
+ }
+
+ public List<AgvLocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) {
+ if (Cools.isEmpty(orderNo) && Cools.isEmpty(matnr) && Cools.isEmpty(maktx) && Cools.isEmpty(specs) && Cools.isEmpty(locNo)) {
+ return new ArrayList<AgvLocDetl>();
+ }
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ if(Cools.isEmpty(orderNo)){
+ wrapper.like("order_no",orderNo);
+ }
+ if(Cools.isEmpty(matnr)){
+ wrapper.like("matnr",matnr);
+ }
+ if(Cools.isEmpty(maktx)){
+ wrapper.like("maktx",maktx);
+ }
+ if(Cools.isEmpty(specs)){
+ wrapper.like("specs",specs);
+ }
+ if(Cools.isEmpty()){
+ wrapper.like("loc_no",locNo);
+ }
+ return this.selectList(wrapper);
+ }
+
private List<String> queryAgvStaNosByFloor(int floor){
List<String> agvStaNos = new ArrayList<>();
if(floor == 1){
@@ -93,4 +152,12 @@
return agvStaNos;
}
+
+ private void wapperSetCondition(Wrapper wrapper,String column, String condition){
+ if(Cools.isEmpty(condition)){
+ wrapper.isNull(column);
+ }else {
+ wrapper.eq(column,condition);
+ }
+ }
}
--
Gitblit v1.9.1