From 79b63172dc5571d3bd07de3d8a2021fe6dd74277 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期四, 22 四月 2021 20:02:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 2
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 6
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 203 +++++++++---
WebTM/views/车间管理/工序出站发出单/Cj_StationOutBillList.html | 189 +++++++++++
WebTM/views/车间管理/工序出站发出单/Cj_StationOutBill.html | 476 +++++++++++++++++++++++++++++
WebTM/views/index.html | 7
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 63 +--
WebTM/WebTM.csproj | 2
8 files changed, 855 insertions(+), 93 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 84d2b57..9eacd91 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -1271,6 +1271,12 @@
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
<publishTime>04/08/2021 10:57:44</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBill.html">
+ <publishTime>04/22/2021 17:01:48</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBillList.html">
+ <publishTime>04/22/2021 17:08:14</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>03/29/2021 20:16:17</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2e8bfd9..935915f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -442,6 +442,8 @@
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯鍙戝嚭鍗昞Cj_StationOutBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯鍙戝嚭鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index bd1d2f4..2dd59fd 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -344,6 +344,13 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>宸ュ簭鍑虹珯鍙戝嚭鍗�</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯鍙戝嚭鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯鍙戝嚭鍗曞垪琛�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<li data-name="set" class="layui-nav-item">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index 18739d7..4cd2343 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -329,7 +329,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3791' },
+ data: { "HBillType": '3793' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBill.html"
new file mode 100644
index 0000000..abbfc9c
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBill.html"
@@ -0,0 +1,476 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <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">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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 src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 100px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div class="maintitle">宸ュ簭鍑虹珯鍙戝嚭</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;width:46%;">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="title">鍩烘湰淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹浜�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpID" id="HEmpID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杩涚珯鏃堕棿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupID" id="HGroupID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HGroupID" id="HGroupID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="" style="width: 85%;">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="title">鍏朵粬淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="text-align: center;">
+ <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="lngBillKey" id="lngBillKey">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+ <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HEmpID").val(sessionStorage["Czybm"]);
+ $("#HEmp").val(sessionStorage["HUserName"]);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3790' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "lngICMOEntryID": data.lngICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "lngBillKey": data.hmainid,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HQty": 0,
+ });
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ });
+ })
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //var tableData = data.field;
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
+ //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.confirm(data.Message, {
+ // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ // btn2: function () {
+ // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ // parent.location.href = "../../../views/index.html"
+ // }//鍏抽棴
+ //}, function () { window.location.reload(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(btnSearchProc)', function () {
+ layer.msg('绂佹閫夋嫨');
+ //layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HWHID']
+ // , resize: false
+ // , cancel: function () {
+ // }
+ //})
+ });
+
+ //閫夋嫨渚涘簲鍟�
+ form.on('submit(btnSearchSup)', function () {
+ layer.msg('绂佹閫夋嫨');
+ });
+
+ //閫夋嫨浜у搧
+ form.on('submit(btnSearchMater)', function () {
+ layer.msg('绂佹閫夋嫨');
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) {
+ $("#HProcName").val(obj[0].HName);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBillList.html"
new file mode 100644
index 0000000..9a985be
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\345\217\221\345\207\272\345\215\225/Cj_StationOutBillList.html"
@@ -0,0 +1,189 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<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">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <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>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </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>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </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>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , 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 = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ //,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜' }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , {
+ field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.杩涚珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HBillNo").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HBillNo = $("#HBillNo").val();
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Cj_StationOutBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 6480589..2760ef9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -55,7 +55,7 @@
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;width:46%;">
- <input type="text" name="" id="" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -65,20 +65,20 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="" id="">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
</div>
</div>
</div>
@@ -86,19 +86,23 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">褰撳墠宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -106,27 +110,23 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
- <input type="hidden" name="" id="" value="0">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹鏁伴噺</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
- <input type="hidden" name="" id="">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
@@ -136,22 +136,25 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹浜�</label>
- <div class="layui-input-block" style="margin-left: 104px;">
- <input type="text" class="layui-input" name="" id="" value="16" style="background-color:#efefef4d;width: 80%;display: inline-block;" readonly>
- <span>%</span>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpID" id="HEmpID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID" id="HEmpID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="" id="">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -159,19 +162,24 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杩涚珯鏃堕棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" value="0">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇鐝粍</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupID" id="HGroupID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HGroupID" id="HGroupID">
</div>
</div>
</div>
@@ -179,13 +187,17 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
</div>
</div>
</div>
@@ -198,11 +210,56 @@
</div>
</div>
</div>
+ <div class="title">鍏朵粬淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
<button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
<!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
@@ -225,9 +282,10 @@
, element = layui.element;
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
-
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HEmpID").val(sessionStorage["Czybm"]);
$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -236,7 +294,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3791' },
+ data: { "HBillType": '3790' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -261,33 +319,62 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HICMOBillNo": data.浠诲姟鍗曞彿,
"HICMOInterID": data.hicmointerid,
+ "lngICMOEntryID": data.lngICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HQty": 0,
- "HPieceQty": data.鐢熶骇鏁伴噺,
- "HPlanQty": data.鐢熶骇鏁伴噺,
- "lngBillSubKey": data.HSubID,
- "lngBillKey": data.HMainID,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "lngBillKey": data.hmainid,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
- "HMoney": 0,
- //"HProcID": data.HProcID,
- //"HProcNo": data.宸ュ簭鍙�,
- //"HProcName": data.宸ュ簭,
- "HSupID": data.HSupID,
- "HSup": data.渚涘簲鍟�,
- "HSourceID": data.HSourceID,
- "HSource": data.鐢熶骇璧勬簮,
- "HGroupID": data.HGroupID,
- "HGroup": data.鐝粍,
- "HDeptID": sessionStorage["HDeptID"],
- "HDept": sessionStorage["HDept"]
+ "HQty": 0,
+ });
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
layer.close(index);
}
@@ -318,7 +405,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
//url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
async: true,
data: { "oMain": oMain },
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 16dd14d..23150fa 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>濮斿宸ュ簭鎺ユ敹鍗曞垪琛�</title>
+<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">
@@ -73,57 +73,52 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , util = layui.util
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ //,height: 'full-50'
, page: true
,cellMinWidth: 90
, cols: [[
{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
- , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
- , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
- , { field: 'HSupID', title: 'HSupID', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜' }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- , { field: '鎺ユ敹鍚堟牸鏁伴噺', title: '鎺ユ敹鍚堟牸鏁伴噺' }
- , { field: '鎺ユ敹涓嶅悎鏍兼暟閲�', title: '鎺ユ敹涓嶅悎鏍兼暟閲�' }
- , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环' }
- , { field: '鍚◣閲戦', title: '鍚◣閲戦' }
- , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦' }
- , { field: '鎺ユ敹鏃堕棿', title: '鎺ユ敹鏃堕棿' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
- , { field: 'Hsubid', title: 'Hsubid', hide: true }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , {
+ field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.杩涚珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
]]
};
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+ url: GetWEBURL() + '/Cj_StationInBill/list',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -155,7 +150,7 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+ url: GetWEBURL() + '/Cj_StationInBill/list',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
--
Gitblit v1.9.1