From cc344f433bf14d966207255ac0c8f93a9a46dec2 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 09 三月 2021 15:41:25 +0800
Subject: [PATCH] 1.0.5 1.pda新增平仓入库功能 2.pda新增主界面方块型功能菜单
---
src/main/webapp/views/pda/combPro.html | 5
src/main/webapp/views/pda/index.html | 71 +++++++-
src/main/webapp/views/pda/stockIn.html | 7
src/main/resources/mapper/LocNormalMapper.xml | 44 +++--
src/main/webapp/views/pda/comb.html | 5
src/main/java/com/zy/asrs/service/LocNormalService.java | 2
src/main/java/com/zy/asrs/entity/param/LocNormalParam.java | 17 ++
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 5
src/main/java/com/zy/asrs/controller/LocNormalController.java | 49 ++++-
src/main/java/com/zy/asrs/mapper/LocNormalMapper.java | 2
src/main/webapp/static/css/pda.css | 5
src/main/webapp/views/pda/stockOut.html | 5
src/main/webapp/views/pda/locNormalIn.html | 214 ++++++++++++++++++++++++++
13 files changed, 385 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index c17ad69..275454e 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.param.LocNormalParam;
import com.zy.asrs.service.LocNormalService;
import com.zy.common.utils.excel.locNomal.LocNormalExcel;
import com.zy.common.utils.excel.locNomal.LocNormalExcelListener;
@@ -27,36 +28,39 @@
import java.io.IOException;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
-public class LocNormalController extends BaseController{
+public class LocNormalController extends BaseController {
@Autowired
private LocNormalService locNormalService;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocNormal> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(LocNormal.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.eq("state", "1").or().eq("state", "2");
return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -84,7 +88,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocNormal> wrapper = new EntityWrapper<LocNormal>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locNormalService.selectOne(wrapper)){
+ if (null != locNormalService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocNormal.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -114,13 +118,28 @@
locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
}
- // 瀵煎叆
+ /* 瀵煎叆 */
@RequestMapping(value = "/locNormal/import/auth")
@ManagerAuth(memo = "骞充粨绠＄悊瀵煎叆")
@Transactional
- public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
+ public R locNormalImport(MultipartFile file) throws IOException, InterruptedException {
LocNormalExcelListener listener = new LocNormalExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), LocNormalExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
+ return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
+ }
+
+ /* pda鍏ュ簱 */
+ @RequestMapping(value = "/locNormal/pda/in")
+ @ManagerAuth(memo = "骞充粨绠＄悊pda鍏ュ簱")
+ @Transactional
+ public R locNormalPdaIn(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ for (Integer i = 0; i < param.getNormalList().size(); i++) {
+ param.getNormalList().get(i).setAppeUser(userId);
+ param.getNormalList().get(i).setAppeTime(timeNow);
+ }
+ locNormalService.pdaLocNormalIn(param.getNormalList());
+ return R.ok();
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/LocNormalParam.java b/src/main/java/com/zy/asrs/entity/param/LocNormalParam.java
new file mode 100644
index 0000000..69df344
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/LocNormalParam.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.asrs.entity.LocNormal;
+
+import java.util.List;
+
+public class LocNormalParam {
+ private List<LocNormal> normalList;
+
+ public List<LocNormal> getNormalList() {
+ return normalList;
+ }
+
+ public void setNormalList(List<LocNormal> normalList) {
+ this.normalList = normalList;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
index a604a9e..0e808c1 100644
--- a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
@@ -23,4 +23,6 @@
public void outLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime);
public void removeLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime);
+
+ public void pdaLocNormalIn(List<LocNormal> list);
}
diff --git a/src/main/java/com/zy/asrs/service/LocNormalService.java b/src/main/java/com/zy/asrs/service/LocNormalService.java
index cb7bc97..507f32e 100644
--- a/src/main/java/com/zy/asrs/service/LocNormalService.java
+++ b/src/main/java/com/zy/asrs/service/LocNormalService.java
@@ -15,4 +15,6 @@
public void outLocNormal(String matnr, Long modiUser, Date modiTime);
public void removeLocNormal(String matnr, Long modiUser, Date modiTime);
+
+ public void pdaLocNormalIn(List<LocNormal> list);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index cfdbba9..5c8e190 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -34,4 +34,9 @@
public void removeLocNormal(String matnr, Long modiUser, Date modiTime) {
baseMapper.removeLocNormal(matnr, modiUser, modiTime);
}
+
+ @Override
+ public void pdaLocNormalIn(List<LocNormal> list) {
+ baseMapper.pdaLocNormalIn(list);
+ }
}
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index af772d4..8d8f254 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -4,22 +4,22 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocNormal">
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="lgnum" property="lgnum" />
- <result column="type" property="type" />
- <result column="mnemonic" property="mnemonic" />
- <result column="supplier" property="supplier" />
- <result column="warehouse" property="warehouse" />
- <result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="state" property="state" />
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="lgnum" property="lgnum"/>
+ <result column="type" property="type"/>
+ <result column="mnemonic" property="mnemonic"/>
+ <result column="supplier" property="supplier"/>
+ <result column="warehouse" property="warehouse"/>
+ <result column="brand" property="brand"/>
+ <result column="anfme" property="anfme"/>
+ <result column="bname" property="bname"/>
+ <result column="memo" property="memo"/>
+ <result column="modi_user" property="modiUser"/>
+ <result column="modi_time" property="modiTime"/>
+ <result column="appe_user" property="appeUser"/>
+ <result column="appe_time" property="appeTime"/>
+ <result column="state" property="state"/>
</resultMap>
<select id="getLocNormalData" resultMap="BaseResultMap">
@@ -42,4 +42,16 @@
update asr_loc_normal set state = '3',modi_user = #{modiUser, jdbcType=DECIMAL},
modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR}
</update>
+
+
+ <insert id="pdaLocNormalIn">
+ BEGIN
+ <foreach collection="list" item="item" index="index">
+ INSERT INTO asr_loc_normal (matnr, maktx, anfme, warehouse, state, appe_user, appe_time)
+ VALUES (#{item.matnr,jdbcType=VARCHAR}, #{item.maktx,jdbcType=VARCHAR}, #{item.anfme,jdbcType=DECIMAL},
+ #{item.warehouse,jdbcType=VARCHAR}, '1', #{item.appeUser,jdbcType=DECIMAL},
+ #{item.appeTime,jdbcType=TIMESTAMP})
+ </foreach>
+ END;
+ </insert>
</mapper>
diff --git a/src/main/webapp/static/css/pda.css b/src/main/webapp/static/css/pda.css
index 5a9609e..3fcffb6 100644
--- a/src/main/webapp/static/css/pda.css
+++ b/src/main/webapp/static/css/pda.css
@@ -35,6 +35,11 @@
height: 40px;
margin-right: 0;
}
+#warehouse {
+ width: 65%;
+ height: 40px;
+ margin-right: 0;
+}
header button {
height: 20px;
width: 70px;
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 9cc59d2..62da8ce 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -36,6 +36,7 @@
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
<span id="tips"></span>
</div>
</footer>
@@ -181,5 +182,9 @@
$("#code").focus();
}
}
+
+ function back() {
+ parent.backIndex();
+ }
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 6963fb2..1c120d8 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -74,6 +74,7 @@
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
<span id="tips"></span>
</div>
</footer>
@@ -341,5 +342,9 @@
$("#code").focus();
}
}
+
+ function back() {
+ parent.backIndex();
+ }
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index f015b95..6304cc9 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -13,10 +13,12 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
}
+
html {
height: 100%;
/*line-height: 1.5;*/
}
+
body {
height: 100%;
/*overflow: hidden;*/
@@ -30,12 +32,14 @@
position: fixed;
width: 100%;
overflow: hidden;
- box-shadow: 0 1px 2px 0 rgba(0,0,0,.1)
+ box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1)
}
+
.nav li {
float: left;
border-right: 1px solid #f1f1f1; /*todo*/
}
+
.nav li a {
font-size: 20px;
letter-spacing: 1px;
@@ -47,48 +51,85 @@
/*-webkit-transform:scale(1.5);*/
/*-moz-transform:scale(1.5);*/
}
+
.nav li a:hover {
color: #000;
}
+
.nav-unselect {
- color: #666;
+ color: blue;
}
+
.nav-select {
- background-color: #f1f1f1; /*todo*/
- color: #000;
+ background-color: #f1f1f1; /*todo*/
+ color: blue;
}
/* 涓讳綋 */
#content {
- padding-top: 32px;
+ /*padding-top: 32px;*/
width: 100%;
height: 100%;
}
+
iframe {
border-width: 0;
+ }
+
+ td {
+ text-align: center;
+ vertical-align: middle;
+ height: 80px;
+ font-size: 24px;
}
</style>
</head>
<body>
-<!-- 瀵艰埅鏍� -->
-<ul class="nav">
- <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
- <li><a id="combPro" onclick="nav(this.id)" class="nav-unselect" href="#">鍏宠仈缁勬墭</a></li>
- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>
- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
-</ul>
+<!-- 瀵艰埅鑿滃崟 -->
+<table id="navList" style="width: 100%; border-color: #e6e6e6" border="1" cellspacing="1">
+ <tr>
+ <td>
+ <a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a>
+ </td>
+ <td>
+ <a id="combPro" onclick="nav(this.id)" class="nav-unselect" href="#">鍏宠仈缁勬墭</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a>
+ </td>
+ <td>
+ <a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a id="locNormalIn" onclick="nav(this.id)" class="nav-unselect" href="#">骞充粨鍏ュ簱</a>
+ </td>
+ <td></td>
+ </tr>
+</table>
<!-- 涓讳綋鍐呭 -->
-<iframe id="content" src="comb.html"></iframe>
+<iframe id="content" src=""></iframe>
+
</body>
<script>
// 瀵艰埅鏍�
function nav(id) {
$('.nav-select').attr("class", "nav-unselect");
- $('#'+id).attr("class", "nav-select");
- $('#content').attr("src", id+".html");
+ $('#' + id).attr("class", "nav-select");
+ $('#content').attr("src", id + ".html");
+ $('#navList').css('display', 'none');
+ $('#content').css('display', 'block');
+ }
+
+ function backIndex() {
+ $('#navList').css('display', 'inline-table');
+ $('#content').css('display', 'none');
}
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
new file mode 100644
index 0000000..0a07ed3
--- /dev/null
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+ <title>骞充粨鍏ュ簱</title>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/pda.css" media="all">
+ <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>
+ <style>
+
+ </style>
+</head>
+<body>
+<!-- 澶撮儴 -->
+<header>
+ <div>
+ <div class="layui-input-inline">
+ <label class="layui-form-label">搴� 鍖�</label>
+ <input class="layui-input" type="number" id="warehouse" onkeyup="findCode(this)" placeholder="鎵爜 / 杈撳叆"
+ autocomplete="off">
+ </div>
+ </div>
+
+ <div style="margin: 5px 5px">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i
+ class="layui-icon">+</i>鎻愬彇
+ </button>
+ </div>
+</header>
+
+<!-- 涓讳綋 -->
+<main>
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</main>
+<!-- 灏鹃儴 -->
+<footer>
+ <div class="layui-btn-container">
+ <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()"
+ style="margin-left: 20px">缁勬墭
+ </button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()"
+ style="margin-left: 20px">杩斿洖
+ </button>
+ <span id="tips"></span>
+ </div>
+</footer>
+</body>
+<script>
+ var tableIns;
+ layui.use(['table', 'laydate', 'form'], function () {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ data: [],
+ limit: 500,
+ cellMinWidth: 50,
+ cols: [[
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style: 'color: blue', width: 50},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ ]],
+ done: function (res, curr, count) {
+ }
+ });
+
+ });
+
+ window.onload = function () {
+ document.getElementById("warehouse").focus();
+ }
+
+ function findCode(el) {
+ if (el.value.length === 7) {
+ $('#mat-btn').focus();
+ getMat();
+ }
+ }
+
+ var matCodeLayerIdx;
+
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鎻愬彇鐗╂枡',
+ shade: [0.3, '#000'],
+ area: ['90%', '80%'],
+ content: 'matQuery.html',
+ success: function (layero, index) {
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+
+ function addTableData(data) {
+ if (isEmpty(data.matName)) {
+ tips("鎻愬彇澶辫触", true);
+ return;
+ }
+ let toPush = true;
+ for (var j = 0; j < matData.length; j++) {
+ if (data.matNo === matData[j].matNo) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#code').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ }
+
+ // 缁勬墭
+ function comb() {
+ let barcode = $('#warehouse').val();
+ if (isEmpty(barcode)) {
+ tips("搴撳尯鏉＄爜涓虹┖", true);
+ document.getElementById("warehouse").focus();
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+
+ // 鏋勯�犲钩浠撳叆搴撴暟鎹�
+ var data = []
+ matData.map(function (item) {
+ data.push({
+ matnr: item.matNo,
+ maktx: item.matName,
+ anfme: item.count,
+ warehouse: barcode,
+ });
+ });
+
+ // 璇锋眰淇濆瓨鎺ュ彛
+ $.ajax({
+ url: baseUrl + "/locNormal/pda/in",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ normalList: data,
+ }),
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ },
+ });
+
+
+ }
+
+ /**
+ * 鎻愮ず淇℃伅
+ * @param msg 鎻愮ず鍐呭
+ * @param warn true锛氱孩鑹插瓧浣�
+ */
+ function tips(msg, warn) {
+ // var tips = $('#tips');
+ // tips.html(msg);
+ // tips.css("color", warn?"red":'#666');
+ layer.msg(msg, {icon: warn ? 2 : 1})
+ }
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ $("#comb-btn").focus();
+ comb();
+ } else if (key === 113) {
+ $("#code").val("");
+ $("#code").focus();
+ }
+ }
+
+ function back() {
+ parent.backIndex();
+ }
+</script>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 07c06b4..c2a35a4 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -92,6 +92,9 @@
</main>
<!-- 灏鹃儴 -->
<footer>
+ <div class="layui-btn-container" style="text-align: center; margin-bottom: 8px">
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" >杩斿洖</button>
+ </div>
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button id="empty-pakin" type="button" class="layui-btn layui-btn-normal" onclick="emptyPakIn()" style="margin-left: 15px">绌烘澘鍏ュ簱</button>
@@ -316,6 +319,10 @@
$("#code").focus();
}
}
+
+ function back() {
+ parent.backIndex();
+ }
</script>
<script type="text/template" id="putSiteSelectTemplate">
{{#each data}}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 2e59ec2..c6d05c5 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -54,6 +54,7 @@
<div class="layui-btn-container">
<button id="reset" type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button id="pakOut" type="button" class="layui-btn layui-btn-normal" onclick="pakOut()" style="margin-left: 20px">鍑哄簱</button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
<span id="tips"></span>
</div>
</footer>
@@ -279,6 +280,10 @@
$("#locNo").focus();
}
}
+
+ function back() {
+ parent.backIndex();
+ }
</script>
<script type="text/template" id="takeSiteSelectTemplate">
{{#each data}}
--
Gitblit v1.9.1