From 65ad59fc53b0fee72bb06da3b89bcc4867848ee8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期六, 09 四月 2022 14:06:15 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/result/StockVo.java | 19 +++++++++ src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3 + src/main/java/com/zy/asrs/service/LocDetlService.java | 3 + src/main/java/com/zy/asrs/controller/OpenController.java | 19 ++++++--- src/main/resources/mapper/LocDetlMapper.xml | 10 +++++ src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 7 +++ 6 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index df24f0b..925fa41 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -7,10 +7,7 @@ import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.OpenOrderPakinParam; -import com.zy.asrs.service.DocTypeService; -import com.zy.asrs.service.MatService; -import com.zy.asrs.service.OrderDetlService; -import com.zy.asrs.service.OrderService; +import com.zy.asrs.service.*; import com.zy.common.model.DetlDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +24,7 @@ * Created by vincent on 2022/4/8 */ @RestController -@RequestMapping("open/asrs/") +@RequestMapping("open/asrs") public class OpenController { @Autowired @@ -40,11 +37,13 @@ private DocTypeService docTypeService; @Autowired private MatService matService; + @Autowired + private LocDetlService locDetlService; /** * 娣诲姞鍏ュ簱鍗� */ - @PostMapping("order/pakin/default/v1") + @PostMapping("/order/pakin/default/v1") @Transactional public synchronized R orderCreate(@RequestBody OpenOrderPakinParam param) { if (Cools.isEmpty(param)) { @@ -141,4 +140,12 @@ } + /** + * 搴撳瓨缁熻 + */ + @RequestMapping("/stock/default/v1") + public R queryStock() { + return R.ok(locDetlService.queryStockTotal()); + } + } diff --git a/src/main/java/com/zy/asrs/entity/result/StockVo.java b/src/main/java/com/zy/asrs/entity/result/StockVo.java new file mode 100644 index 0000000..b4d99ca --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/result/StockVo.java @@ -0,0 +1,19 @@ +package com.zy.asrs.entity.result; + +import lombok.Data; + +/** + * Created by vincent on 2022/4/9 + */ +@Data +public class StockVo { + + private String matnr; + + private String batch; + + private Double count; + + private String memo; + +} diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java index b72f87e..10c52f1 100644 --- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.result.StockVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -52,4 +53,6 @@ Double queryStockAnfme(String matnr, String batch); + List<StockVo> queryStockTotal(); + } diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java index e498382..ef6ee1f 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.result.StockVo; import java.util.List; @@ -42,4 +43,6 @@ Double queryStockAnfme(String matnr, String batch); + List<StockVo> queryStockTotal(); + } diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 23a6c91..65ea1c8 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -1,9 +1,9 @@ package com.zy.asrs.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.mapper.LocDetlMapper; import com.zy.asrs.service.LocDetlService; import org.springframework.stereotype.Service; @@ -78,6 +78,11 @@ } @Override + public List<StockVo> queryStockTotal() { + return this.baseMapper.queryStockTotal(); + } + + @Override public LocDetl selectItem(String locNo, String matnr, String batch) { return this.baseMapper.selectItem(locNo, matnr, batch); } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index 2ef13d2..28b911c 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -277,4 +277,14 @@ </if> </select> + <select id="queryStockTotal" resultType="com.zy.asrs.entity.result.StockVo"> + select + matnr, + batch, + count(anfme) as count + from asr_loc_detl + where 1=1 + group by matnr,batch + </select> + </mapper> -- Gitblit v1.9.1