From 5b455f3ad343bc9fc5a2a1fe7bfc37807181e572 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 13:01:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 48 ++++++++++++++++-------
src/main/java/com/zy/common/model/LocDto.java | 10 +++++
src/main/java/com/zy/asrs/controller/OutController.java | 10 +++++
src/main/java/com/zy/common/model/enums/HtmlNavIconType.java | 1
4 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 49d5e1c..bda3a19 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
@@ -100,4 +101,13 @@
return R.ok().add(locDtos);
}
+ @PostMapping("/out/pakout/auth")
+ public R pakout(@RequestBody List<LocDto> locDtos) {
+ if (Cools.isEmpty(locDtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ System.out.println(JSON.toJSONString(locDtos));
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 970d523..ca099a3 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.core.common.Cools;
import lombok.Data;
import java.util.List;
@@ -25,6 +26,8 @@
private boolean lack = false;
private List<Integer> staNos;
+
+ private Integer staNo;
public LocDto() {
}
@@ -57,4 +60,11 @@
return this.matnr + "锛�" + this.maktx + "锛�";
}
+ public void setStaNos(List<Integer> staNos) {
+ this.staNos = staNos;
+ if (!Cools.isEmpty(staNos)) {
+ this.staNo = staNos.get(0);
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java b/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
index db6d690..5fc44ee 100644
--- a/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
+++ b/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
@@ -12,6 +12,7 @@
IO_WORK("ioWork", "layui-icon-flag"),
WORK_FLOW("workFlow", "layui-icon-form"),
BASE("base", "layui-icon-file"),
+ ORDER("erp", "layui-icon-senior")
;
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1de0d0a..d9f3b50 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -123,7 +123,7 @@
});
function pakoutPreview(ids) {
- var loadIndex = layer.load(2);
+ let loadIndex = layer.load(2);
$.ajax({
url: baseUrl + "/out/pakout/preview/auth",
headers: {'token': localStorage.getItem('token')},
@@ -132,22 +132,21 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
+ var tableCache;
if (res.code === 200){
layer.open({
type: 1
,title: false
,closeBtn: false
,offset: '100px'
- // ,area: ['1000px', '700px']
,area: '1200px'
,shade: 0.5
,shadeClose: true
- ,btn: ['绔嬪嵆鐢熸垚', '绋嶅悗澶勭悊']
+ ,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
,btnAlign: 'c'
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
,content: $('#pakoutPreviewBox').html()
,success: function(layero, index){
- console.log(res.data)
table.render({
elem: '#stoPreTab',
data: res.data,
@@ -160,34 +159,32 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
{field: 'batch', title: '鎵瑰彿', merge: ['title'], align: 'center'},
- // {field: 'anfme', title: '鎬绘暟閲�', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNo', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
- // {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
- // {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
]],
done: function (res) {
tableMerge.render(this);
$('.layui-table-body.layui-table-main').css("overflow", "auto");
-
+ tableCache = tableData = table.cache.stoPreTab;
}
});
-
+ form.on('select(tbBasicTbStaNos)', function (obj) {
+ let index = obj.othis.parents('tr').attr("data-index");
+ let data = tableCache[index];
+ data['staNo'] = Number(obj.elem.value);
+ return false;
+ });
}
,yes: function(index, layero){
- //鎸夐挳銆愰┈涓婃嫞璐с�戠殑鍥炶皟
- stockOut(data.orderNo);
+ //鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
+ pakout(tableCache);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
layer.close(index)
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
}
- });
- form.on('select(tbBasicTbStaNos)', function (data) {
- alert("ajax璇锋眰锛�" + JSON.stringify(data))
- return false;
});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -198,6 +195,27 @@
})
}
+ function pakout(tableCache) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl + "/out/pakout/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ data: JSON.stringify(tableCache),
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ }
+
/* 鏄剧ず琛ㄥ崟寮圭獥 */
function showEditModel(mData) {
--
Gitblit v1.9.1