From a63de0a719690fd1887e848676b12c21fe819df1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 19 四月 2024 09:42:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2 ++
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 3 +++
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 9 +++++++--
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 10 ----------
src/main/java/com/zy/asrs/entity/OrderDetl.java | 7 +++++++
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 7 +++++++
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 17 +++++++++++++----
8 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index ce90a9e..d38f1b6 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,9 +13,7 @@
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +34,10 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -120,7 +123,13 @@
orderNos.add(order.getOrderNo());
}
wrapper.in("order_no",orderNos);
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 2d20f94..ae6e8fa 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,6 +62,13 @@
private Double qty;
/**
+ * 搴撳瓨鏁伴噺
+ */
+ @ApiModelProperty(value= "搴撳瓨鏁伴噺")
+ @TableField(exist = false)
+ private Double stock;
+
+ /**
* 鐗╂枡鍙�
*/
@ApiModelProperty(value= "鐗╂枡鍙�")
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index 958ec68..acfd6af 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -22,6 +22,9 @@
Integer getStockStatisCount(Map<String, Object> map);
+ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode}")
+ Double selectSumAnfmeByMatnr(@Param("matnr") String matnr,@Param("threeCode") String threeCode);
+
@Select("SELECT SUM(anfme) FROM agv_loc_detl")
Integer sum();
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 5adb710..b24bc79 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -20,6 +20,8 @@
Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page);
+ Double getSumAnfme(String matnr, String threeCode);
+
Integer sum();
List<AgvLocDetl> getStockStatisExcel();
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 2fd0459..9dbd0ea 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,6 +12,8 @@
Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
+ Page<OrderDetl> getPakoutDetlPage(Page<OrderDetl> page);
+
OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode);
OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode);
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 c41d8c3..9dc37f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -117,9 +117,14 @@
return page;
}
+ @Override
+ public Double getSumAnfme(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnr(matnr, threeCode);
+ }
+
/*
- 鑾峰彇搴撳瓨鎬绘暟
- */
+ 鑾峰彇搴撳瓨鎬绘暟
+ */
public Integer sum() {
return this.baseMapper.sum();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 0f8c4b7..6b14423 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -31,6 +31,13 @@
}
@Override
+ public Page<OrderDetl> getPakoutDetlPage(Page<OrderDetl> page) {
+ page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+ page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+ return page;
+ }
+
+ @Override
public OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode) {
return this.baseMapper.selectItem(orderId,matnr,batch,csocode,isoCode);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9fb31c8..f08cbde 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -108,11 +108,6 @@
orderService.checkComplete(o);
});
}
- AgvBasDevp basDevp = agvBasDevpService.selectByDevNo(agvBasDevp);
- basDevp.setLocSts("O");
- basDevp.setBarcode("");
- basDevp.setLocType2(null);
- agvBasDevpService.updateById(basDevp);
return SUCCESS;
}
@@ -199,11 +194,6 @@
orderService.checkComplete(o);
});
}
- AgvBasDevp basDevp = agvBasDevpService.selectByDevNo(agvBasDevp);
- basDevp.setLocSts("O");
- basDevp.setBarcode("");
- basDevp.setLocType2(null);
- agvBasDevpService.updateById(basDevp);
return SUCCESS;
}
--
Gitblit v1.9.1