From d4db9ab5b5d0b2fccdbced8d37507d82607deb91 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 17 六月 2020 16:13:34 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/pakStore/stockAdjust.js | 11 +++++ src/main/webapp/static/js/pakStore/locMove.js | 3 - src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 9 ++++ src/main/webapp/views/pakStore/stockAdjust.html | 38 +++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 2a0ef7b..768e468 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -395,6 +395,13 @@ wrkDetl.setIoTime(new Date()); wrkDetl.setMatnr(locDetl.getMatnr()); wrkDetl.setAnfme(locDetl.getAnfme()); + wrkDetl.setZmatid(locDetl.getZmatid()); + wrkDetl.setTbpos(locDetl.getTbpos()); + wrkDetl.setTbnum(locDetl.getTbnum()); + wrkDetl.setLgnum(locDetl.getLgnum()); + wrkDetl.setAltme(locDetl.getAltme()); + wrkDetl.setBname(locDetl.getBname()); + wrkDetl.setMaktx(locDetl.getMaktx()); wrkDetl.setAppeTime(new Date()); wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(new Date()); @@ -423,7 +430,7 @@ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�"); } } else { - throw new CoolException("棰勭害鐩爣搴撲綅鍏ュ簱澶辫触锛岀姸鎬侊細"+loc.getLocType$()); + throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocType$()); } } diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js index c864b59..b5ba2a0 100644 --- a/src/main/webapp/static/js/pakStore/locMove.js +++ b/src/main/webapp/static/js/pakStore/locMove.js @@ -19,8 +19,7 @@ even: true, cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} + {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} ,{field: 'matnr', align: 'center',title: '鐗╂枡'} ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'} ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'} diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js new file mode 100644 index 0000000..58f1ffe --- /dev/null +++ b/src/main/webapp/static/js/pakStore/stockAdjust.js @@ -0,0 +1,11 @@ +var pageCurr; +layui.use(['table','laydate', 'form'], function() { + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + + + +}) \ No newline at end of file diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html new file mode 100644 index 0000000..4f78e49 --- /dev/null +++ b/src/main/webapp/views/pakStore/stockAdjust.html @@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <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> + html { + height: 100%; + padding: 10px; + background-color: #f1f1f1; + } + body { + background-color: #fff; + border-radius: 5px; + box-shadow: 0 0 3px rgba(0,0,0,.3); + } + + </style> +</head> +<body> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> +<script type="text/javascript" src="../../static/js/pakStore/stockAdjust.js" charset="utf-8"></script> + + +</body> +</html> + -- Gitblit v1.9.1