From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单：先扫条码再扫货架，如果不匹配不允许提交。2、下架找货单：已下架的条码允许再次下架。
---
WebTM/views/工序汇报/MES_StationInBillList.html | 219 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 133 insertions(+), 86 deletions(-)
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
index 37b5f39..423a830 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,11 @@
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
-
+ <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -25,28 +29,28 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <label class="layui-form-label">杩涚珯鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="date" class="layui-input" id="杩涚珯鏃堕棿">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <label class="layui-form-label">浠诲姟鍗�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <input type="text" class="layui-input" name="浠诲姟鍗�" id="浠诲姟鍗�">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <input type="text" class="layui-input" name="鍗曟嵁鍙�" id="鍗曟嵁鍙�">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -54,21 +58,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ヤ綔涓績</label>
+ <label class="layui-form-label">宸ュ簭娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ <input type="text" class="layui-input" name="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">娴佽浆鍗″彿</label>
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ <input type="text" class="layui-input" name="浜у搧鍚嶇О" id="浜у搧鍚嶇О">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
+ <label class="layui-form-label">鐢熶骇鐝粍</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaker" id="HMaker">
+ <input type="text" class="layui-input" name="鐢熶骇鐝粍" id="鐢熶骇鐝粍">
</div>
</div>
</div>
@@ -79,21 +83,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鎿嶄綔鍛�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hname" id="hname">
+ <input type="text" class="layui-input" name="鎿嶄綔鍛�" id="鎿嶄綔鍛�">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label">瀹㈡埛淇℃伅</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ <input type="text" class="layui-input" name="瀹㈡埛淇℃伅" id="瀹㈡埛淇℃伅">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <label class="layui-form-label">鑱旂郴浜轰俊鎭�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ <input type="text" class="layui-input" name="鑱旂郴浜轰俊鎭�" id="鑱旂郴浜轰俊鎭�">
</div>
</div>
</div>
@@ -117,31 +121,32 @@
</div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ , height: 'full-50'
, page: true
, cols: [[
//{ field: 'HEmpID', title: 'HEmpID', sort: true, width: 110 }
@@ -149,31 +154,73 @@
//, { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165 }
//, { field: 'HProcID', title: 'HProcID', width: 175 }
//, { field: 'HSourceID', title: 'HSourceID', width: 170 }
- { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 120 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
- , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
- , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ {
+ field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.杩涚珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 140 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 145 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 145 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 90 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 90 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 90 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 90 }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 80 }
+ , { field: '瀹㈡埛淇℃伅', title: '瀹㈡埛淇℃伅', width: 250 }
+ , { field: '鑱旂郴浜轰俊鎭�', title: '鑱旂郴浜轰俊鎭�', width: 100 }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
//, { field: 'hmainid', title: 'hmainid', width: 160 }
//, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
//, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 80 }
//, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 80 }
//, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
-
]]
};
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/StationInBillListDelete_Json',
+ type: "GET",
+ data: { "sHInterID": obj.data.hmainid },
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ } else {
+ layer.alert(data.code + data.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/api/newBill/getStationInBillList',
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -189,63 +236,63 @@
skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
});
}
- });
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- $("#WorkCenter").val("");//宸ヤ綔涓績
- $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
- $("#HMaker").val("");//鍒跺崟浜�
- $("#hname").val("");//浜у搧鍚嶇О
- $("#hnumber").val("");//浜у搧浠ｇ爜
- $("#hmodel").val("");//瑙勬牸鍨嬪彿
+ $("#杩涚珯鏃堕棿").val("");//杩涚珯鏃堕棿
+ $("#浠诲姟鍗�").val("");//浠诲姟鍗�
+ $("#鍗曟嵁鍙�").val("");//鍗曟嵁鍙�
+ $("#宸ュ簭娴佽浆鍗″彿").val("");//宸ュ簭娴佽浆鍗″彿
+ $("#浜у搧鍚嶇О").val("");//浜у搧鍚嶇О
+ $("#鐢熶骇鐝粍").val("");//鐢熶骇鐝粍
+ $("#鎿嶄綔鍛�").val("");//鎿嶄綔鍛�
+ $("#瀹㈡埛淇℃伅").val("");//瀹㈡埛淇℃伅
+ $("#鑱旂郴浜轰俊鎭�").val("");//鑱旂郴浜轰俊鎭�
$("#btnSearch").click();
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- var WorkCenter = $("#WorkCenter").val();//宸ヤ綔涓績
- var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
- var HMaker = $("#HMaker").val();//鍒跺崟浜�
- var hname = $("#hname").val();//浜у搧鍚嶇О
- var hnumber = $("#hnumber").val();//浜у搧浠ｇ爜
- var hmodel = $("#hmodel").val();//瑙勬牸鍨嬪彿
- if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ var 杩涚珯鏃堕棿 = $("#杩涚珯鏃堕棿").val();//杩涚珯鏃堕棿
+ var 浠诲姟鍗� = $("#浠诲姟鍗�").val();//浠诲姟鍗�
+ var 鍗曟嵁鍙� = $("#鍗曟嵁鍙�").val();//鍗曟嵁鍙�
+ var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();//宸ュ簭娴佽浆鍗″彿
+ var 浜у搧鍚嶇О = $("#浜у搧鍚嶇О").val();//浜у搧鍚嶇О
+ var 鐢熶骇鐝粍 = $("#鐢熶骇鐝粍").val();//鐢熶骇鐝粍
+ var 鎿嶄綔鍛� = $("#鎿嶄綔鍛�").val();//鎿嶄綔鍛�
+ var 瀹㈡埛淇℃伅 = $("#瀹㈡埛淇℃伅").val();//瀹㈡埛淇℃伅
+ var 鑱旂郴浜轰俊鎭� = $("#鑱旂郴浜轰俊鎭�").val();//鑱旂郴浜轰俊鎭�
+ if (杩涚珯鏃堕棿) {
+ sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) = '" + 杩涚珯鏃堕棿 + "'";
}
- if (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ if (浠诲姟鍗�) {
+ sWhere += " and 浠诲姟鍗� like '%" + 浠诲姟鍗� + "%'";
}
- if (HOrderProcNO) {
- sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ if (鍗曟嵁鍙�) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + 鍗曟嵁鍙� + "%'";
}
- if (WorkCenter) {
- sWhere += " and 宸ヤ綔涓績 like '%" + WorkCenter + "%'";
+ if (宸ュ簭娴佽浆鍗″彿) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
}
- if (HProcExchBillNo) {
- sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ if (浜у搧鍚嶇О) {
+ sWhere += " and 浜у搧鍚嶇О like '%" + 浜у搧鍚嶇О + "%'";
}
- if (HMaker) {
- sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'";
+ if (鐢熶骇鐝粍) {
+ sWhere += " and 鐢熶骇鐝粍 like '%" + 鐢熶骇鐝粍 + "%'";
}
- if (hname) {
- sWhere += " and 浜у搧鍚嶇О like '%" + hname + "%'";
+ if (鎿嶄綔鍛�) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + 鎿嶄綔鍛� + "%'";
}
- if (hnumber) {
- sWhere += " and 浜у搧浠ｇ爜 like '%" + hnumber + "%'";
+ if (瀹㈡埛淇℃伅) {
+ sWhere += " and 瀹㈡埛淇℃伅 like '%" + 瀹㈡埛淇℃伅 + "%'";
}
- if (hmodel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + hmodel + "%'";
+ if (鑱旂郴浜轰俊鎭�) {
+ sWhere += " and 鑱旂郴浜轰俊鎭� like '%" + 鑱旂郴浜轰俊鎭� + "%'";
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/api/newBill/getStationInBillList',
+ url: GetWEBURL() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -275,7 +322,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
</script>
--
Gitblit v1.9.1