From 0a58dc2ed7c8349efc4e7dd0b45d8c6ab7e6f9df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 三月 2021 11:07:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 6 ++
src/main/java/com/zy/asrs/service/LocDetlService.java | 4 +
src/main/java/com/zy/asrs/controller/OpenController.java | 56 ++++++++++++++++++
src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 21 +++++++
src/main/java/com/zy/asrs/entity/result/StoPreTab.java | 35 +++++++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +
7 files changed, 128 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index dda44f6..f43c842 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,8 +3,12 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.param.OpenApiStockOutParam;
+import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatCodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
@@ -12,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -24,6 +29,57 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatCodeService matCodeService;
+
+ @PostMapping("/stockOut/prew")
+ @Transactional
+ public R stockOutPrew(@RequestBody List<OpenApiStockOutParam> params){
+ List<StoPreTab> result = new ArrayList<>();
+ StringBuilder errorMsg = new StringBuilder();
+ boolean error = false;
+ for (OpenApiStockOutParam param : params) {
+ Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
+ if (sumAnfme < param.getAnfme()) {
+ if (!error) {
+ error = true;
+ }
+ MatCode mat = matCodeService.selectById(param.getMatnr());
+ errorMsg.append(mat == null ? param.getMatnr() : mat.getMatName()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(param.getAnfme() - sumAnfme).append("</br>");
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
+ double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
+ double anfme = issued;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(locDetl.getMatnr() + "锛�" + locDetl.getMaktx() + "锛�");
+ tab.setMatnr(locDetl.getMatnr());
+ tab.setMaktx(locDetl.getMaktx());
+ tab.setAnfme(param.getTotal());
+
+ tab.setLocNo(locDetl.getLocNo());
+// tab.setNodeId(locDetl.getNodeId());
+ tab.setTotal(locDetl.getAnfme());
+ tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setRemQty(tab.getTotal() - tab.getReduce());
+ tab.setPrior(false);
+ tab.setPrior$("脳");
+ tab.setType(2);
+ result.add(tab);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+
+ }
+ if (error) {
+ return R.error().add(errorMsg.toString());
+ }
+ return R.ok().add(result);
+ }
@PostMapping("/stockOut")
@Transactional
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java
index 7ca31bf..4160f3e 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java
@@ -12,4 +12,6 @@
private Double anfme;
+ private Double total;
+
}
diff --git a/src/main/java/com/zy/asrs/entity/result/StoPreTab.java b/src/main/java/com/zy/asrs/entity/result/StoPreTab.java
new file mode 100644
index 0000000..3342e44
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/StoPreTab.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/13
+ */
+@Data
+public class StoPreTab {
+
+ private String title;
+
+ private String matnr;
+
+ private String maktx;
+
+ private Double anfme;
+
+ private String locNo;
+
+ private Long nodeId;
+
+ private Double total;
+
+ private Double reduce;
+
+ private Double remQty;
+
+ private Boolean prior;
+
+ private String prior$;
+
+ private Integer type;
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 8afdb63..551dae4 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -33,4 +33,10 @@
Integer getStockStatisCount(Map<String, Object> map);
List<LocDetl> getStockStatisExcel();
+
+ @Select("select sum(anfme) as sum from asr_loc_detl where matnr = #{matnr}")
+ Double selectSumAnfmeByMatnr(@Param("matnr") String matnr);
+
+ List<LocDetl> selectPakoutByRule(String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 48bc303..cd3db83 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -24,8 +24,10 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
-
Page<LocDetl> getStockStatis(Page<LocDetl> page);
Double getSumAnfme(String matnr);
+
+ List<LocDetl> selectPakoutByRule(String matnr);
+
}
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 1031c7f..2442384 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -53,4 +53,9 @@
return this.baseMapper.selectSumAnfmeByMatnr(matnr);
}
+ @Override
+ public List<LocDetl> selectPakoutByRule(String matnr) {
+ return this.baseMapper.selectPakoutByRule(matnr);
+ }
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0230022..bbc4c50 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -105,4 +105,25 @@
group by a.matnr
</select>
+ <select id="selectPakoutByRule" resultMap="BaseResultMap">
+ select * from asr_loc_detl
+ where 1=1
+ and matnr = #{matnr}
+ order by
+ DATEPART(yyyy,modi_time),DATEPART(mm,modi_time),DATEPART(dd,modi_time)
+ desc,
+ case
+ when (left(loc_no, 2) = '01') then 0
+ when (left(loc_no, 2) = '02') then 1
+ when (left(loc_no, 2) = '03') then 1
+ when (left(loc_no, 2) = '04') then 0
+ when (left(loc_no, 2) = '05') then 0
+ when (left(loc_no, 2) = '06') then 1
+ when (left(loc_no, 2) = '07') then 1
+ when (left(loc_no, 2) = '08') then 0
+ else 0
+ end
+ desc
+ </select>
+
</mapper>
--
Gitblit v1.9.1