From 34cf0264825200331a4abc5120b603ac7f2690cc Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 13 七月 2021 13:54:17 +0800
Subject: [PATCH] 发货通知允许捡料出库
---
src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java | 7 +++++++
src/main/webapp/views/pakStore/outStockDetail.html | 16 ++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index 1771ce8..e99acff 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -170,6 +170,13 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ // 濡傛灉涓烘崱鏂欏嚭搴撻渶瑕佸垽鏂墭鐩樼爜鏄惁涓虹┖
+ if (ioType == 103) {
+ String zpallet = detlDto.getLocDetl().getZpallet();
+ if (Cools.isEmpty(zpallet)) {
+ throw new CoolException("鎷ｆ枡鍑哄簱蹇呴』鍚湁鎵樼洏鐮�");
+ }
+ }
// 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
WrkDetl wrkDetl = new WrkDetl();
diff --git a/src/main/webapp/views/pakStore/outStockDetail.html b/src/main/webapp/views/pakStore/outStockDetail.html
index c526c29..a7ff310 100644
--- a/src/main/webapp/views/pakStore/outStockDetail.html
+++ b/src/main/webapp/views/pakStore/outStockDetail.html
@@ -44,21 +44,29 @@
var orderData = parent.getOrderData();
var locData = [];
var form;
-
+ var table;
function getCol() {
var cols = [
{field: '', align: 'center', title: '', width: 50, type: 'numbers'}
, {field: 'locNo$', align: 'center', title: '搴撲綅鍙�'}
+ , {field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 500}
+ ,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
+ ,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
+ ,{field: 'mnemonic', align: 'center',title: '鐢熶骇鍗曞彿'}
+ ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', edit: 'text', style: 'color: blue; font-weight: bold'}
+ // ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
];
- cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true})
return cols;
}
layui.use(['table', 'laydate', 'form'], function () {
- var table = layui.table;
+ table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
@@ -136,7 +144,7 @@
locDetls: locDetls,
fbillNo: orderData.fbillNo,
}
-
+ // 璋冪敤鍑哄簱鎺ュ彛
$.ajax({
url: baseUrl+"/plate/outStock/start",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1