From 40bfd7078ca4e46ae127dea1cf37870af2865c46 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 15:21:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 16 +++++
src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java | 29 +++++++++
src/main/webapp/static/js/custOrder/custOrder.js | 34 +++++++++--
src/main/java/zy/cloud/wms/common/service/MainService.java | 76 +++++++++++++++++++-----
4 files changed, 131 insertions(+), 24 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 4e6a347..808eaaa 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -38,14 +38,56 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+// @Transactional
+// public List<StoPreVo> stockOutPreview0(OrderStoDto dto) {
+// if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
+// throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+// }
+// // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+// locDetlService.checkLocDetlCount(dto.getNumber());
+// List<StoPreVo> result = new ArrayList<>();
+// for (CustOrder custOrder : dto.getCustOrders()) {
+// // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+// Mat mat = matService.selectByMatnr(custOrder.getUserCode());
+// if (null == mat) {
+// throw new CoolException(custOrder.getUserCode() + "鐗╂枡灏氭湭鏇存柊銆�" + custOrder.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
+// }
+// // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+// List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
+// double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
+// // 瑙嗗浘瀵硅薄
+// StoPreVo vo = new StoPreVo();
+// vo.setMatnr(mat.getMatnr());
+// vo.setMaktx(mat.getMaktx());
+// vo.setAnfme(issued);
+// List<StoPreVo.StoPreLoc> locVos = new ArrayList<>();
+// vo.setLocs(locVos);
+// for (LocDetl locDetl : locDetls) {
+// if (issued > 0) {
+// StoPreVo.StoPreLoc locVo = new StoPreVo.StoPreLoc();
+// locVo.setLocNo(locDetl.getLocNo());
+// locVo.setNodeId(locDetl.getNodeId());
+// locVo.setTotal(locDetl.getAnfme());
+// locVo.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+// locVo.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+// locVos.add(locVo);
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// }
+// }
+// result.add(vo);
+// }
+// return result;
+// }
+
@Transactional
- public List<StoPreVo> stockOutPreview(OrderStoDto dto) {
+ public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
locDetlService.checkLocDetlCount(dto.getNumber());
- List<StoPreVo> result = new ArrayList<>();
+ List<StoPreTab> result = new ArrayList<>();
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -55,27 +97,27 @@
// 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
- // 瑙嗗浘瀵硅薄
- StoPreVo vo = new StoPreVo();
- vo.setMatnr(mat.getMatnr());
- vo.setMaktx(mat.getMaktx());
- vo.setAnfme(issued);
- List<StoPreVo.StoPreLoc> locVos = new ArrayList<>();
- vo.setLocs(locVos);
+ double anfme = issued;
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
- StoPreVo.StoPreLoc locVo = new StoPreVo.StoPreLoc();
- locVo.setLocNo(locDetl.getLocNo());
- locVo.setNodeId(locDetl.getNodeId());
- locVo.setTotal(locDetl.getAnfme());
- locVo.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- locVo.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
- locVos.add(locVo);
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMatnr() + "<br>" + mat.getMaktx() + "<br>鏁伴噺锛�" + anfme);
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(anfme);
+
+ tab.setLocNo(locDetl.getLocNo());
+ tab.setNodeId(locDetl.getNodeId());
+ tab.setTotal(locDetl.getAnfme());
+ tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ result.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
- result.add(vo);
+
}
return result;
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
new file mode 100644
index 0000000..0a73c51
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
@@ -0,0 +1,29 @@
+package zy.cloud.wms.manager.entity;
+
+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 Boolean prior;
+
+}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 0434960..6358a08 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -196,6 +196,7 @@
}),
method: 'POST',
success: function (res) {
+ console.log(res)
layer.close(loadIndex);
// 鎴愬姛
if (res.code === 200){
@@ -204,19 +205,38 @@
,title: false
,closeBtn: false
,offset: '100px'
- ,area: '300px;'
+ ,area: '1200px;'
,shade: 0.5
,id: 'LAY_layuipro'
,btn: ['椹笂鎷ｈ揣', '绋嶅悗澶勭悊']
,btnAlign: 'c'
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
- ,content: '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">浣犵煡閬撳悧锛熶翰锛�<br>layer 鈮� layui<br><br>layer鍙槸浣滀负Layui鐨勪竴涓脊灞傛ā鍧楋紝鐢变簬鍏剁敤鎴峰熀鏁拌緝澶э紝鎵�浠ュ父甯镐細鏈変汉浠ヤ负layui鏄痩ayerui<br><br>layer铏界劧宸茶 Layui 鏀剁紪涓哄唴缃殑寮瑰眰妯″潡锛屼絾浠嶇劧浼氫綔涓轰竴涓嫭绔嬬粍浠跺叏鍔涚淮鎶ゃ�佸崌绾с��<br><br>鎴戜滑姝ゅ悗鐨勫緛閫旀槸鏄熻景澶ф捣 ^_^</div>'
- ,success: function(layero){
- var btn = layero.find('.layui-layer-btn');
- btn.find('.layui-layer-btn0').attr({
- href: 'http://www.layui.com/'
- ,target: '_blank'
+ // ,content: '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">浣犵煡閬撳悧锛熶翰锛�<br>layer 鈮� layui<br><br>layer鍙槸浣滀负Layui鐨勪竴涓脊灞傛ā鍧楋紝鐢变簬鍏剁敤鎴峰熀鏁拌緝澶э紝鎵�浠ュ父甯镐細鏈変汉浠ヤ负layui鏄痩ayerui<br><br>layer铏界劧宸茶 Layui 鏀剁紪涓哄唴缃殑寮瑰眰妯″潡锛屼絾浠嶇劧浼氫綔涓轰竴涓嫭绔嬬粍浠跺叏鍔涚淮鎶ゃ�佸崌绾с��<br><br>鎴戜滑姝ゅ悗鐨勫緛閫旀槸鏄熻景澶ф捣 ^_^</div>'
+ ,content: $('#stoukOutPreview')
+ ,success: function(layero, index){
+ table.render({
+ elem: '#stoPreTab',
+ // url: 'tablex-tb2.json',
+ data: res.data,
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ {field: 'title', title: '鍚嶇О', sort: true},
+ {field: 'maktx', title: '鑿滃崟鍚嶇О'},
+ {field: 'locNo', title: '璐т綅'},
+ {field: 'reduce', title: '鍑哄簱鏁伴噺'},
+ {field: 'prior', title: '鎺ㄨ崘璐т綅'},
+ ]],
+ done: function () {
+ tableX.merges('stoPreTab', [0]);
+ }
});
+
+ // var btn = layero.find('.layui-layer-btn');
+ // btn.find('.layui-layer-btn0').attr({
+ // href: 'http://www.layui.com/'
+ // ,target: '_blank'
+ // });
}
});
// 缂烘枡
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 4f36cf7..f80b93a 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -9,6 +9,14 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ .layui-table-cell {
+ height:auto;
+ overflow:visible;
+ text-overflow:inherit;
+ white-space:normal;
+ }
+ </style>
</head>
<body>
@@ -87,7 +95,15 @@
<script type="text/javascript" src="../../static/js/custOrder/custOrder.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<!-- 鎵撳嵃瀹瑰櫒 -->
<div id="pakoutPrintBox" style="display: none"></div>
+<!-- 鍑哄簱棰勮瀹瑰櫒 -->
+<div id="stoukOutPreview" style="display: none">
+ <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold">鎷ｈ揣鍗曢瑙�</span>
+ </div>
+ <table id="stoPreTab" lay-filter="stoPreTab"></table>
+</div>
</body>
--
Gitblit v1.9.1