From 2f14b82be33feef39fb04d6afe31be915375da5c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 29 六月 2023 16:01:45 +0800
Subject: [PATCH] 提料计划报表 动态显示日期 生产计划平台 提料运算(缺料) 齐套分析列表优化
---
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 4 +
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 36 ++++++++++++-----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 6 +-
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 2
WebTM/views/生产管理/即时库存/JIT_InventoryList.html | 2 +
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 55 +++++++++++++++++++++------
6 files changed, 76 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
index de380f8..c3f8c1a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
@@ -151,6 +151,8 @@
, { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
, { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
, { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+ , { field: '浠撲綅ID', title: '浠撲綅ID', hide: true }
+ , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О' }
, { field: '搴撳瓨涓诲崟浣岻D', title: '搴撳瓨涓诲崟浣岻D', hide: true }
, { field: '鍗曚綅缂栫爜', title: '鍗曚綅缂栫爜' }
, { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index a625129..274927d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -48,7 +48,7 @@
<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="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="width: 60%; display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index d6abfb0..30fc31f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -165,8 +165,8 @@
$("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+ ////鍒濆鍖栬〃鏍�
+ //set_InitGrid();
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -175,12 +175,6 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐' });
@@ -196,12 +190,40 @@
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
+
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
- }
+
columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
option = {
@@ -217,6 +239,7 @@
};
}
//#endregion
+
//鑾峰彇缁勭粐
function Organ() {
@@ -282,6 +305,10 @@
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
sWhere = {
HORGID: HORGID
, HBEGINDATE: HBEGINDATE
@@ -291,6 +318,8 @@
, HXQD: HXQD
, HPURORDERNO: HPURORDERNO
}
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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 bc3c768..ed6bfc1 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"
@@ -41,13 +41,16 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <label class="layui-form-label" style="width: 85px;">鎻愭枡绫诲瀷</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <select name="HTLType" id="HTLType" lay-verify="HTLType">
+ <option value="缂烘枡" selected="selected">缂烘枡</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <!--<option value="閲囪喘璁㈠崟">閲囪喘璁㈠崟</option> 鏆傛椂娌℃湁-->
</select>
</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;">
@@ -72,7 +75,7 @@
<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="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -95,15 +98,14 @@
<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="text" class="layui-input" name="HMaterName" id="HMaterName">
</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="HOrderType" id="HOrderType" lay-verify="HOrderType">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
- <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+ <option value="鐢熶骇鐢ㄦ枡娓呭崟" selected="selected">鐢熶骇鐢ㄦ枡娓呭崟</option>
<option value="鏍囧噯Bom">鏍囧噯Bom</option>
</select>
</div>
@@ -119,7 +121,7 @@
<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>
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
</div>
</div>
<div class="layui-inline">
@@ -129,14 +131,24 @@
</div>
</div>
</div>
+ <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
+ <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="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</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="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -837,6 +849,7 @@
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, area: ['90%', '90%']//澶у皬
, title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
@@ -901,12 +914,13 @@
HProdORGID: $("#HProdORGID").val()
, HWorkShopID: $("#HWorkShopID").val()
}
+ var HTLType = $("#HTLType").val();
sWhere = JSON.stringify(sWhere);
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["Czybm"], "HTLType": HTLType },
success: function (data1) {
if (data1.count == 1) {
get_FastQuery(2);
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 4cc6f22..ed0aa47 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"
@@ -247,7 +247,9 @@
, { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О' }
, { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
, { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 120}
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 120 }
+ , { field: '浠撲綅ID', title: '浠撲綅ID', hide: true }
+ , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О' }
, { field: '鎵瑰彿', title: '鎵瑰彿' ,width:120}
]]
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index fd8606e..6b5d751 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1781,7 +1781,7 @@
layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
time = setInterval(function () {
dy(data);
- }, 1000);
+ }, 2000);
//鍏抽棴褰撳墠frame
layer.close(index);
})
@@ -1797,7 +1797,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: { "sWhere": sWhere },
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1816,7 +1816,7 @@
var args = {
type: "print",
showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娑ょ憾.grf"),
+ report: urlAddRandomNo("../../grf/cs10.grf"),
data: Customer
};
//var args = {
--
Gitblit v1.9.1