From a174623ab37ef0cd756d2d5e07437a7293b0a422 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 五月 2021 13:59:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 4 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..f0c1f00 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,10 +1,18 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.OpenApiStockOutParam;
-import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.entity.result.PakoutVo;
+import com.zy.asrs.entity.result.StoPreTab;
+import com.zy.asrs.service.*;
+import com.zy.common.model.LocDetlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
@@ -12,6 +20,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,24 +33,149 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatCodeService matCodeService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @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);
+ double lack = 0.0D;
+ if (sumAnfme < param.getAnfme()) {
+ lack = param.getAnfme() - sumAnfme;
+ if (!error) {
+ error = true;
+ }
+ MatCode mat = matCodeService.selectById(param.getMatnr());
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(param.getMatnr() + (mat==null?"": "锛�" + mat.getMatName() + "锛�"));
+ tab.setMatnr(param.getMatnr());
+ tab.setMaktx((mat==null?"": "锛�" + mat.getMatName() + "锛�"));
+ tab.setAnfme(param.getTotal());
+ tab.setLocNo("缂鸿揣");
+ tab.setTotal(lack);
+ tab.setReduce(lack);
+ tab.setRemQty(0.0D);
+ tab.setPrior(false);
+ tab.setPrior$("脳");
+ tab.setType(0);
+ result.add(tab);
+
+ 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.of(param.getAnfme() - lack).orElse(0.0D) ;
+ 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(errorMsg.toString());
+// }
+ return R.ok(errorMsg).add(result);
+ }
@PostMapping("/stockOut")
@Transactional
public R stockOut(@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()) {
- throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
+ 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.selectPakoutByRule(param.getMatnr());
+ double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 鐢熸垚鍑哄簱宸ヤ綔妗�
+ // 鍏ㄦ澘
+ if (issued>=locDetl.getAnfme()) {
+ 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());
+ // 鎷ｆ枡
+ } 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());
+ }
+
+ 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();
+ return R.ok().add(result);
}
--
Gitblit v1.9.1