From f66b98a1be56a35e4fc46c22c46fd126657becb9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 03 六月 2021 14:22:59 +0800
Subject: [PATCH] 补仓功能
---
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 | 103 +++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 7 ++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 9 +++
6 files changed, 124 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 901b4e0..39e8eac 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -20,9 +21,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;
+import java.util.*;
/**
* Created by vincent on 2021/3/19
@@ -178,5 +177,103 @@
return R.ok().add(result);
}
+ @PostMapping("/available/take/site")
+ @Transactional
+ public R availableTakeSite(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ for (Integer siteId : outSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ result.add(map);
+ }
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ for (Integer siteId : pickOutSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+ @PostMapping("/get/asrsLocDetl")
+ @Transactional
+ public R queryLocDetl(String matnr) {
+ List<LocDetl> locDetls = locDetlService.getAsrsLocDetl(matnr);
+ return R.ok().add(locDetls);
+ }
+
+ @PostMapping("/stockOut/locMode")
+ @Transactional
+ public R stockOutLocMode(@RequestBody List<OpenApiStockOutParam> params){
+ List<PakoutVo> result = new ArrayList<>();
+ if (!Cools.isEmpty(params)) {
+ for (OpenApiStockOutParam param : params) {
+ // 鎺ㄨ崘璐т綅琛ヤ粨宸ヤ綔妗ｉ槻閲�
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("packed", param.getAllotNo()).le("wrk_sts", 14)) > 0) {
+ throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝ｅ湪鎵ц锛岃鑰愬績绛夊緟");
+ }
+ Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
+ if (!Cools.isEmpty(param.getAllotNo()) && sumAnfme < param.getAnfme()) {
+ throw new CoolException("绔嬪簱搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
+ }
+ double lack = 0.0D;
+ if (sumAnfme < param.getAnfme()) {
+ lack = param.getAnfme() - sumAnfme;
+ PakoutVo pakoutVo = new PakoutVo();
+ pakoutVo.setLocNo("缂鸿揣");
+ pakoutVo.setAnfme(lack);
+ pakoutVo.setMatnr(param.getMatnr());
+// pakoutVo.setZpallet("param.getZpallet()");
+ result.add(pakoutVo);
+
+// throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
+ }
+
+ // 鏍规嵁绔嬪簱搴撲綅鐮佸幓鑾峰彇绔嬪簱淇℃伅
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));
+ if (locDetls.size() == 0) {
+ throw new CoolException("鏈煡璇㈠埌搴撲綅淇℃伅锛�");
+ }
+ double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
+ for (LocDetl locDetl : locDetls) {
+ // 鐢熸垚鍑哄簱宸ヤ綔妗�
+
+ Integer locNoNum = locDetlService.countLocNoNum(locDetl.getLocNo());
+ // 鍏ㄦ澘
+ if (locNoNum == 1) {
+ BasDevp staNo = basDevpService.checkSiteStatus(103);
+ List<LocDetlDto> detlDtos = new ArrayList<>();
+ LocDetlDto dto = new LocDetlDto();
+ dto.setLocDetl(locDetl);
+ dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ detlDtos.add(dto);
+ workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()));
+ } else { // 鎷ｆ枡
+ BasDevp staNo = basDevpService.checkSiteStatus(107);
+ List<LocDetlDto> detlDtos = new ArrayList<>();
+ LocDetlDto dto = new LocDetlDto();
+ dto.setLocDetl(locDetl);
+ dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ detlDtos.add(dto);
+ workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()));
+ }
+ PakoutVo pakoutVo = new PakoutVo();
+ pakoutVo.setLocNo(locDetl.getLocNo());
+ pakoutVo.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ pakoutVo.setMatnr(locDetl.getMatnr());
+ pakoutVo.setZpallet(locDetl.getZpallet());
+ result.add(pakoutVo);
+
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+
+ }
+ }
+
+ return R.ok().add(result);
+ }
}
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 cac303e..b36315d 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenApiStockOutParam.java
@@ -8,6 +8,8 @@
@Data
public class OpenApiStockOutParam {
+ private String locNo;
+
private String matnr;
private Double anfme;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 551dae4..a789797 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -39,4 +39,7 @@
List<LocDetl> selectPakoutByRule(String matnr);
+ List<LocDetl> getAsrsLocDetl(String matnr);
+
+ Integer countLocNoNum(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index cd3db83..fe43697 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -30,4 +30,7 @@
List<LocDetl> selectPakoutByRule(String matnr);
+ List<LocDetl> getAsrsLocDetl(String matnr);
+
+ Integer countLocNoNum(String locNo);
}
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 2442384..0600db7 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -58,4 +58,13 @@
return this.baseMapper.selectPakoutByRule(matnr);
}
+ @Override
+ public List<LocDetl> getAsrsLocDetl(String matnr) {
+ return this.baseMapper.getAsrsLocDetl(matnr);
+ }
+
+ @Override
+ public Integer countLocNoNum(String locNo) {
+ return this.baseMapper.countLocNoNum(locNo);
+ }
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index bbc4c50..678cb77 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -126,4 +126,11 @@
desc
</select>
+ <select id="getAsrsLocDetl" resultMap="BaseResultMap">
+ select a.* from asr_loc_detl a left join asr_loc_mast b on a.loc_no = b.loc_no where a.matnr = #{matnr} and b.loc_sts = 'F'
+ </select>
+
+ <select id="countLocNoNum" resultType="integer">
+ select count(*) from asr_loc_detl where loc_no = #{loc_no}
+ </select>
</mapper>
--
Gitblit v1.9.1