From 277a5967109b03fe9aaf7b7130492716c44e9a2f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 七月 2023 13:31:04 +0800
Subject: [PATCH] 材料规格自动带出 可以输入,材料规格放在第一个页签 生产订单编辑 加 客户规格型号 客户物料名称 客户订单报表增加两字段（业务状态、备注取生产订单），报表增加两个按钮，可以去变更两个字段的值。（业务状态修改成完工之后，报表就显示ok，选择其中一行变更后反写到生产订单当中） 生产日计报表，双击明细内容，根据日期和流转卡号调出生产入库报表数据
---
WebTM/views/车间管理/报表分析/sc_ICOMRKReport.html | 34 ++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 20 ++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 13 +-
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 35 ++++++++
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 77 ++++++++++++++++++
6 files changed, 167 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 8076540..65de11e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -119,8 +119,6 @@
</button>
</div>
</div>
-
-
<div class="layui-inline" style="width: 51%;">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -257,6 +255,20 @@
</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="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
+ </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="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline" style="width: 56%;">
<label class="layui-form-label" style="width: 85px;">鐧藉澂瑕佹眰</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -273,7 +285,7 @@
</div>
</div>
</div>
- </div>
+ </div>
<!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
@@ -1013,6 +1025,8 @@
, "HWidth": d.data[0].HWidth
, "HWeight": d.data[0].HWeight
, "HColorRemark": d.data[0].鏌撹壊瑕佹眰
+ , "HCusMaterName": d.data[0].瀹㈡埛鐗╂枡鍚嶇О
+ , "HCusModel": d.data[0].瀹㈡埛瑙勬牸鍨嬪彿
//鍏朵粬淇℃伅
, "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
, "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index 8f2c989..111eace 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -300,6 +300,12 @@
<input type="hidden" class="layui-input" name="HCusID" id="HCusID">
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs6 layui-inline">
@@ -581,12 +587,7 @@
</button>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
- </div>
- </div>
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
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_ProcessExchangeBill_Mul.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_ProcessExchangeBill_Mul.html"
index f7a7303..ec08dd7 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_ProcessExchangeBill_Mul.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_ProcessExchangeBill_Mul.html"
@@ -727,7 +727,7 @@
$("#HEmpID").val(data1.data[0].HEmpID);
//$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
//$("#HAuxUnit").val(data1.data[0].HAuxUnit);
- // $("#HMaterModel").val(data1.data[0].HMaterModel);
+ $("#HMaterModel").val(data1.data[0].瑙勬牸鍨嬪彿);
$.ajax({
type: "get",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
index 9c54d3d..736a550 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
@@ -2,7 +2,7 @@
<html>
<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">
@@ -163,6 +163,17 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable1)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//#endregion
@@ -370,6 +381,28 @@
sWhere = "";
}
+ //鍙屽嚮璺宠浆鐢熶骇鍏ュ簱鎶ヨ〃
+ function btnrowDouble(obj) {
+
+ var HProcExchBillNo = obj["宸ヨ壓鍗曞彿"];
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+ if (HProcExchBillNo == "" || HProcExchBillNo == null) {
+ return layer.alert("鏃犵敓浜у叆搴撴槑缁�,鏃犳硶鏌ョ湅!", { icon: 5 });
+ }
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇鍏ュ簱鎶ヨ〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/sc_ICOMRKReport.html?OperationType=1&HProcExchBillNo=' + HProcExchBillNo + '&HBeginDate="' + HBeginDate + '"&HEndDate="' + HEndDate+'"', 'yes']
+ })
+ }
+
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
//鍒濆鍖栨椂闂�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
index c5b732c..28935d2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
@@ -147,13 +147,27 @@
var sWhere = "";
var option = [];
var HModName = "sc_ICOMRKReport";
+ var HProcExchBillNo = "";
+ var HBeginDate_u = "";
+ var HEndDate_u = "";
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HProcExchBillNo = params[params[1]];
+ HBeginDate_u = params[params[2]];
+ HEndDate_u = params[params[3]];
+ }
+
+
//#region 鍒濆鍖栫晫闈�
-
+
set_ClearBill();
//#endregion
@@ -310,6 +324,12 @@
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ if (HProcExchBillNo != "") {
+ sWhere += " and 娴佽浆鍗″彿 ='" + HProcExchBillNo + "'";
+ HBeginDate = HBeginDate_u;
+ HEndDate = HEndDate_u;
+ }
if (HBeginDate != "" && HEndDate != "") {
sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
@@ -502,6 +522,18 @@
})
}
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
//#endregion
});
</script>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
index 575ae24..5cebee3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
@@ -117,6 +117,8 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-form"></i>鍏抽棴璁㈠崟</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddHRemark"><i class="layui-icon layui-icon-form"></i>娣诲姞澶囨敞</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
</script>
@@ -163,11 +165,18 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//閫�鍑�
- case 'btn-exit': Pub_Close(2);
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //鍏抽棴璁㈠崟
+ case 'btn-Close': btn_Close(obj);
break;
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
+ break;
+ //娣诲姞澶囨敞
+ case 'btn-AddHRemark':
+ btn_AddHRemark();
break;
};
});
@@ -372,6 +381,70 @@
sWhere = "";
}
+ //鍏抽棴璁㈠崟
+ function btn_Close(obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ var HICOMBillNoNum = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ HICOMBillNoNum.push(checkStatus.data[i]["鐢熶骇璁㈠崟鍙�"])
+ }
+ var sMainSub = HICOMBillNoNum.toString() + ";" + sessionStorage["HUserName"];
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/sc_ICOMReportClose",
+ type: "POST",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ get_FastQuery();
+ } else {
+ layer.msg(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ });
+ }
+ })
+
+ }
+
+ function btn_AddHRemark() {
+ var checkStatus = table.checkStatus('mainTable');
+ if (checkStatus.data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ } else {
+ layer.prompt({ title: '娣诲姞澶囨敞', formType: 2 }, function (text, index) {
+
+ var sMainSub = checkStatus.data[0]["鐢熶骇璁㈠崟鍙�"]+ ";"+text + ";" + sessionStorage["HUserName"];
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
+ type: "POST",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery();
+ layer.close(index);
+ layer.msg(data1.Message);
+ } else {
+ layer.msg(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ });
+ }
+ })
+
+ });
+ }
+ }
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -483,7 +556,7 @@
//鍙屽嚮璺宠浆瀹㈡埛璁㈠崟鏄庣粏鎶ヨ〃
function btnrowDouble(obj) {
- HICMOBillNo = obj["鐢熶骇璁㈠崟鍙�"];
+ var HICMOBillNo = obj["鐢熶骇璁㈠崟鍙�"];
if (HICMOBillNo == "" || HICMOBillNo == null) {
return layer.alert("鏃犲伐鑹烘槑缁�,鏃犳硶鏌ョ湅!", { icon: 5 });
--
Gitblit v1.9.1