From 45d87ae7a3ea22f298d073ee35fd067d7fd72eb4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 09:35:40 +0800
Subject: [PATCH] #
---
/dev/null | 294 ------------------------------------
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 3
src/main/webapp/static/js/order/out.js | 15 +
src/main/resources/mapper/LocDetlMapper.xml | 20 ++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5
src/main/java/com/zy/common/model/LocDto.java | 54 ++++++
src/main/java/com/zy/asrs/controller/OutController.java | 74 +++++++--
src/main/java/com/zy/asrs/service/LocMastService.java | 6
10 files changed, 158 insertions(+), 321 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
deleted file mode 100644
index 0a87815..0000000
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ /dev/null
@@ -1,294 +0,0 @@
-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;
-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.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.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * Created by vincent on 2021/3/19
- */
-@RestController
-@RequestMapping("/open/api")
-public class OpenController {
-
- private boolean pickSite = false;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private MatCodeService matCodeService;
- @Autowired
- private WorkService workService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @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()) {
- 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) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
-
- int priorCount = jdbcTemplate.queryForObject("select isnull(count(*),0) from man_prior where 1=1 and matnr = '" + param.getMatnr() + "'", Integer.class);
-
- // 鍏ㄦ澘
- 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(), Cools.isEmpty(param.getAllotNo()), null);
- // 鎷ｆ枡
- } else {
-
- if (priorCount > 0) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(locDetl.getAnfme());
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), locDetl.getAnfme()-issued);
- } else {
- BasDevp staNo = basDevpService.checkSiteStatus(pickSite?113:109);
- 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()), null);
- }
-
- }
-
- 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();
- }
- }
-
- }
- }
- pickSite = !pickSite;
- 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()), null);
- } 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()), null);
- }
- 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/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9e66c95..9f494e4 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -3,20 +3,22 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2022/3/26
@@ -31,29 +33,69 @@
private OrderDetlService orderDetlService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
+
+// @PostMapping("/out/pakout/preview/auth")
+// public R pakoutPreview(@RequestBody List<Long> ids) {
+// if (Cools.isEmpty(ids)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+// Set<DetlDto> detlDtos = new HashSet<>();
+// for (OrderDetl orderDetl : orderDetls) {
+// if (DetlDto.hasList(detlDtos, orderDetl)) {
+// DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
+// assert detlDto != null;
+// detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
+// } else {
+// detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
+// }
+// }
+// List<LocDto> locDtos = new ArrayList<>();
+// for (DetlDto detlDto : detlDtos) {
+// double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
+// List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
+// for (LocDetl locDetl : locDetls) {
+// if (issued > 0) {
+// locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// } else {
+// break;
+// }
+// }
+// }
+// return R.ok().add(locDtos);
+// }
@PostMapping("/out/pakout/preview/auth")
public R pakoutPreview(@RequestBody List<Long> ids) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- // 鍚堝苟鍚岀被椤�
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
- Set<DetlDto> detlDtos = new HashSet<>();
+ List<LocDto> locDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- if (DetlDto.hasList(detlDtos, orderDetl)) {
- DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
- } else {
- detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
+ // check stock
+// Double stockAnfme = locDetlService.queryStockAnfme(orderDetl.getMatnr(), orderDetl.getBatch());
+ double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ locDtos.add(new LocDto("缂鸿揣", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued));
}
}
- //
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo());
-
- return R.ok().add(orderDetls);
-
+ return R.ok().add(locDtos);
}
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 1ebb1b2..3142824 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -47,4 +47,6 @@
List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo);
+ Double queryStockAnfme(String matnr, String batch);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 6e4f51d..80a64a6 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -36,7 +36,8 @@
// --------------------------------------------------
-
List<LocDetl> queryStock(String matnr, String batch, String orderNo);
+ Double queryStockAnfme(String matnr, String batch);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 6aaec7d..c05a800 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import java.util.List;
@@ -26,4 +27,9 @@
*/
Boolean checkEmptyCount(LocMast locMast);
+ /**
+ * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
+ */
+ Boolean checkWhole(List<LocDetl> locDetls);
+
}
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 139c1d3..85cca1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -72,4 +72,9 @@
public List<LocDetl> queryStock(String matnr, String batch, String orderNo) {
return this.baseMapper.queryStock(matnr, batch, orderNo);
}
+
+ @Override
+ public Double queryStockAnfme(String matnr, String batch) {
+ return this.baseMapper.queryStockAnfme(matnr, batch);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 463a59c..fe3c612 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
@@ -42,4 +43,9 @@
return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
}
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls) {
+ return null;
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
new file mode 100644
index 0000000..f03977d
--- /dev/null
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -0,0 +1,54 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2022/3/28
+ */
+@Data
+public class LocDto {
+
+ private String locNo;
+
+ private String matnr;
+
+ private String maktx;
+
+ private String batch;
+
+ private String orderNo;
+
+ private Double anfme;
+
+ public LocDto() {
+ }
+
+ public LocDto(String locNo, String matnr, String batch, Double anfme) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ }
+
+ public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ }
+
+ public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ }
+
+ public String getTitle() {
+ return this.matnr + "锛�" + this.maktx + "锛�";
+ }
+
+}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0ef2eaa..6ee3578 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -144,9 +144,14 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- <if test="batch != null and batch != ''">
- and a.batch = #{batch}
- </if>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
<if test="orderNo != null and orderNo != ''">
and a.orderNo = #{orderNo}
</if>
@@ -207,4 +212,13 @@
desc
</select>
+ <select id="queryStockAnfme" resultType="java.lang.Double">
+ select sum(anfme) as count from man_loc_detl
+ where 1=1
+ and matnr = #{matnr}
+ <if test="batch != null and batch != ''">
+ and batch = #{batch}
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index d669ee7..d2aaeca 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -137,6 +137,7 @@
,title: false
,closeBtn: false
,offset: '100px'
+ // ,area: ['1000px', '700px']
,area: '1000px'
,shade: 0.5
,shadeClose: true
@@ -153,14 +154,14 @@
cellMinWidth: 100,
height: 432,
cols: [[
- {field: 'title', title: '鍟嗗搧', merge: true, align: 'center'},
- {field: 'anfme', title: '鎬绘暟閲�', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
- {field: 'type', title: '浠撳簱', merge: true, align: 'center', templet: '#typeTpl', width: 90},
- {field: 'locNo', title: '璐т綅', align: 'center'},
- {field: 'prior$', title: '鎺ㄨ崘璐т綅', align: 'center', width: 100},
- {field: 'reduce', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
+ {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 300},
+ // {field: 'anfme', title: '鎬绘暟閲�', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
+ {field: 'locNo', title: '璐т綅', align: 'center', width: 90},
+ {field: 'batch', title: '鎵瑰彿', align: 'center'},
+ {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
// {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
- {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
+ // {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
]],
done: function () {
$('.layui-table-body.layui-table-main').css("overflow", "auto")
--
Gitblit v1.9.1