From a56c0a30ea517cb2031e679bbda2fd0be7dc833d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 19 十月 2022 09:25:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 9 +
WebTM/views/车间管理/车间收料/JIT_SendGoodsBillList.html | 14 +
WebTM/views/user/login.html | 2
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 2
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 6
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 2
WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html | 4
WebTM/views/Baseset/基础资料/Gy_WarehouseList_JIT.html | 122 +++++++++++++++
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 265 +++++++++++++++++++++++----------
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 42 +++++
WebTM/WebTM.csproj | 1
11 files changed, 376 insertions(+), 93 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 885ea5e..9241518 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -115,6 +115,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWBadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWWasterWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList_JIT.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList_JIT.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList_JIT.html"
new file mode 100644
index 0000000..cd365ac
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList_JIT.html"
@@ -0,0 +1,122 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var MaterNum = params[params[0]];
+ var HOrgID = params[params[1]];
+
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: '浠撳簱ID', width: 150, title: 'ID', hide: true}
+ , { field: '浠撳簱鍚嶇О', width: 150, title: '浠撳簱鍚嶇О' }
+ , { field: '鐗╂枡ID', width: 150, title: '鐗╂枡ID', hide: true }
+ , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 150, title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺' }
+ , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 200, title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺' }
+ , { field: '鐗╂枡缂栫爜', width: 150, title: '鐗╂枡缂栫爜' }
+ , { field: '鐗╂枡鍚嶇О', width: 150, title: '鐗╂枡鍚嶇О' }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', width: 150, title: '鐗╂枡瑙勬牸鍨嬪彿' }
+ , { field: '缁勭粐鍚嶇О', width: 150, title: '缁勭粐鍚嶇О' }
+ , { field: '缁勭粐缂栫爜', width: 150, title: '缁勭粐缂栫爜' }
+ , { field: '浠撳簱缂栫爜', width: 150, title: '浠撳簱缂栫爜' }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = "";
+ if (Where != null) {
+ Value += " and ( 浠撳簱缂栫爜 like '%" + Where + "%' or 浠撳簱鍚嶇О like '%" + Where + "%')";
+ }
+ Value += " and 鐗╂枡缂栫爜 = '" + MaterNum + "' and 搴撳瓨缁勭粐=" + HOrgID;
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ComplementGoodBill/GetWarehouseList_JIT",
+ async: true,
+ data: { "sWhere": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 203229a..63337dd 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -174,7 +174,7 @@
//瀛樺偍閰嶇疆鏂囦欢
function get_WriteConfigFile() {
//娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
- localStorage.clear();
+ localStorage.removeItem("data");
var data = {
UserID: sessionStorage["Czybm"]
, OrgID: sessionStorage["OrganizationID"]
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index 0b883c6..df1a335 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -264,7 +264,7 @@
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 'full-190'
+ , height: 'full-120'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index 4ec2d79..d3866d4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -26,7 +26,7 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">鏍囧噯浠跺彨鏂�</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">鏍囧噯浠跺彨鏂�</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">閰嶅鍙枡</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">鏈�灏忓寘瑁呭彨鏂�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
@@ -38,89 +38,97 @@
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">浣欓噺閫�鏂欑敵璇峰崟</button>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">鎶ュ簾閫�鏂欑敵璇峰崟</button>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">鐢熸垚閫�鏂欏崟</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px;margin-top:5px;" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
+ <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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
+ </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="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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; width: 185px;">
+ <select name="Organization" id="Organization" lay-verify="Organization">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; font-size: 20px;">娑堟伅:</label>
+ <div style=" height:50px;">
+ <p id="wjlCount" style="width: 350px; color: red;"></p>
+ <p id="wtlCount" style="width: 350px; color: red;"></p>
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
<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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
- </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="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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; width: 185px;">
- <select name="Organization" id="Organization" lay-verify="Organization">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:10px;">
- <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" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" 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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
- </div>
+ <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" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
- <div class="layui-row" style="margin-top:10px;">
- <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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </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="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
</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="CPName" lay-verify="CPName" id="CPName" 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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly onmouseover="this.title=this.value">
- </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="MaterialModel" id="MaterialModel" readonly>
</div>
</div>
</div>
+ <div class="layui-row" style="margin-top:10px;">
+ <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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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="CPName" lay-verify="CPName" id="CPName" 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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<div class="layui-collapse">
@@ -160,7 +168,8 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
-
+ //瀹氭椂鏌ヨ 鍒锋柊 鏈嫞鏂� 鏈��鏂� 鏄剧ず鐨勬潯鏁�
+ setInterval(NotGeneratedMaterial, 30000);
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -225,6 +234,11 @@
getXc();
})
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
//闅愯棌鍒楄缃�
form.on('submit(HideColumn)', function () {
get_HideColumn();
@@ -237,10 +251,13 @@
//鍒濆鍖栫晫闈�
function set_ClearBill()
{
+ NotGeneratedMaterial();
set_InitGrid();
get_Display(sWhere);
Organ();
DisPlay_HideColumn();
+ //璇诲彇杩囨护鏉′欢
+ get_ReadConfigFile();
}
//鑾峰彇缁勭粐
function Organ() {
@@ -255,8 +272,17 @@
for (var i = 0; i < data.length; i++) {
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
+
$("#Organization").append(Organization);
+
+ //鑾峰彇瀛樺偍鏁版嵁
+ var dataG = localStorage.getItem("dataJL");
+ if (dataG != null) {
+ var data2 = JSON.parse(dataG);
+ $("#Organization").val(data2["Organization"]);
+ }
form.render('select');
+
}
layer.closeAll("loading");
}
@@ -330,7 +356,8 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
-
+ //瀛樺偍杩囨护鏉′欢
+ get_WriteConfigFile();
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
@@ -469,6 +496,8 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == "OutWarehouse") {
+ var MaterNum = obj.data["鐗╂枡浠ｇ爜"];
+ var HOrgID = $("#Organization").val();
//鎵撳紑缁翠慨椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -478,7 +507,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList_JIT.html?MaterNum=" + MaterNum + "&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -490,8 +519,11 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璋冨嚭浠撳簱": checkStatus.data[0].HName
- , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
+ "璋冨嚭浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+ , "璋冨嚭浠撳簱id": checkStatus.data[0].浠撳簱ID
+ , "璋冨嚭浠撳簱搴撳瓨鏁伴噺": checkStatus.data[0].璋冨嚭浠撳簱搴撳瓨鏁伴噺
+ , "璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺": checkStatus.data[0].璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺
+
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -877,7 +909,80 @@
})
}
-
+ //鏈敓鎴愭嫞鏂欑敵璇峰崟 鏈敓鎴愰��鏂欏崟鐨� 鏁版嵁
+ function NotGeneratedMaterial() {
+ //var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
+ type: "GET",
+ data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#wjlCount").text("宸插彨鏂�,鏈嫞鏂欑敵璇� " + data1.data[1]["鏈敓鎴�"]+" 鏉″崟鎹�");
+ $("#wtlCount").text("宸查��鏂欑敵璇�,鏈��鏂� " + data1.data[0]["鏈敓鎴�"]+" 鏉″崟鎹�");
+ //console.log(data1)
+ //layer.close(ajaxLoad);
+
+ } else {
+ //layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ //layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HSeOrderBillNo").val("");
+ $("#MaterialNumber").val("");
+ $("#MaterialName").val("");
+ $("#MaterialModel").val("");
+ $("#CPNumber").val("");
+ $("#CPName").val("");
+ $("#CPModel").val("");
+ sWhere = "";
+ }
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("dataJL");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#HSeOrderBillNo").val(data2["HSeOrderBillNo"]);
+ $("#DepartmentID").val(data2["DepartmentID"]);
+ $("#DepartmentName").val(data2["DepartmentName"]);
+ $("#MaterialNumber").val(data2["MaterialNumber"]);
+ $("#MaterialName").val(data2["MaterialName"]);
+ $("#MaterialModel").val(data2["MaterialModel"]);
+ $("#CPNumber").val(data2["CPNumber"]);
+ $("#CPName").val(data2["CPName"]);
+ $("#CPModel").val(data2["CPModel"]);
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("dataJL");
+ var data = {
+ HSeOrderBillNo: $("#HSeOrderBillNo").val()
+ , DepartmentID: $("#DepartmentID").val()
+ , DepartmentName: $("#DepartmentName").val()
+ , Organization: $("#Organization").val()
+ , MaterialNumber: $("#MaterialNumber").val()
+ , MaterialName: $("#MaterialName").val()
+ , MaterialModel: $("#MaterialModel").val()
+ , CPNumber: $("#CPNumber").val()
+ , CPName: $("#CPName").val()
+ , CPModel: $("#CPModel").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("dataJL", JSON.stringify(data));
+ }
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 02c1e67..d809cb6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -372,7 +372,7 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150});
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
- columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width:150 });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
index a671ca6..aca51aa 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -22,6 +22,8 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UniformMater" id="UniformMater">榻愭枡</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="LackMater" id="LackMater">缂烘枡</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Revoke" id="Revoke">鎾ら攢</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="WorkShopTure" id="WorkShopTure">杞﹂棿纭鎵ц</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="WorkShopRevoke" id="WorkShopRevoke">鎾ら攢杞﹂棿纭</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -153,6 +155,16 @@
//鎾ら攢
form.on('submit(Revoke)', function (data) {
btnMaterOperation(0);
+ });
+
+ //杞﹂棿纭鎵ц
+ form.on('submit(WorkShopTure)', function (data) {
+ btnWorkShopTure(0);
+ });
+
+ //鎾ら攢杞﹂棿纭
+ form.on('submit(WorkShopRevoke)', function (data) {
+ btnWorkShopTure(1);
});
//#endregion
@@ -367,6 +379,36 @@
}
}
+ function btnWorkShopTure(staus) {
+ var check = table.checkStatus("mainTable");
+
+ if (check.data.length == 0) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ else {
+ var HSourceID = check.data[0]["HSourceID"];
+ var HICMOInterID = check.data[0]["HICMOInterID"];
+ var HDate = check.data[0]["鏃ユ湡"];
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_ICMOSortBill/JIT_ICMOSortBillWorkShopTure',
+ type: "GET",
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HDate": HDate, "HStatus": staus, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message);
+ get_FastQuery();
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index ad23be8..50e3862 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -238,6 +238,15 @@
, { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
, { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
]]
+ , done: function (res, curr, count) {
+ for (var i in res.data) {
+ var item = res.data[i];
+
+ if (item["榻愬鐘舵��"] == "鏈綈濂�") {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ }
+ }
+ }
};
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index 5af95ec..989563e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -244,10 +244,13 @@
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '璋冨叆浠撳簱鍚嶇О', title: '璋冨叆浠撳簱鍚嶇О', width: 170 }
+ , { field: '璋冨嚭浠撳簱鍚嶇О', title: '璋冨嚭浠撳簱鍚嶇О', width: 170 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 170 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
@@ -276,7 +279,6 @@
, { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
, { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
]]
};
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
index 9ce32b2..d3bb444 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
@@ -264,7 +264,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -290,7 +290,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\346\224\266\346\226\231/JIT_SendGoodsBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\346\224\266\346\226\231/JIT_SendGoodsBillList.html"
index 968962b..6310bad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\346\224\266\346\226\231/JIT_SendGoodsBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\346\224\266\346\226\231/JIT_SendGoodsBillList.html"
@@ -233,15 +233,14 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', width: 170 }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
- , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨叆浠撳簱鍚嶇О', title: '璋冨叆浠撳簱鍚嶇О', width: 170 }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨嚭浠撳簱鍚嶇О', title: '璋冨嚭浠撳簱鍚嶇О', width: 170 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
@@ -270,8 +269,11 @@
, { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
, { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
]]
};
}
--
Gitblit v1.9.1