From 01bb4cc6da9641e41d24f6ac7dea6e84cb8ba768 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 01 四月 2023 10:48:31 +0800
Subject: [PATCH] 便捷方式，扫码模板，条码生成、列表，工序出站
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 4
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 134 +++++++-----
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html | 92 ++++----
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 2
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 6
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 16 +
WebTM/views/home/console.html | 54 ++--
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcExchSendWorkBillList.aspx | 2
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 16 +
WebTM/views/home/console_Mobile.html | 8
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 6
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 6
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 51 ++++
WebTM/Web.config | 7
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 4
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 4
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 6
WebTM/views/基础资料/公用基础资料/HBarPlanPrint_GXPG.html | 4
WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 118 +++++-----
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 66 +++--
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 14 +
WebTM/WebTM.csproj | 2
25 files changed, 382 insertions(+), 248 deletions(-)
diff --git a/WebTM/Web.config b/WebTM/Web.config
index 2db5211..ee4e5f2 100644
--- a/WebTM/Web.config
+++ b/WebTM/Web.config
@@ -19,6 +19,11 @@
<handlers>
<remove name="StaticFile" />
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule" resourceType="Either" requireAccess="Read" />
- </handlers>
+ </handlers>
+ <security>
+ <requestFiltering>
+ <requestLimits maxAllowedContentLength="10485760" maxQueryString="10485760" /> <!--璁剧疆鍙傛暟鍐呭鐨勬渶澶ч暱搴︿负10MB锛岄粯璁ゆ槸4MB,鏈�澶ф敮鎸�2GB-->
+ </requestFiltering>
+ </security>
</system.webServer>
</configuration>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e384a38..238931f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -110,7 +110,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
- <Content Include="views\Baseset\SRM_OpenTmpList _GXPG.html" />
+ <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html b/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
similarity index 98%
rename from WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html
rename to WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
index 8e75751..900d640 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList _GXPG.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
@@ -88,7 +88,7 @@
var linterid = params[params[0]];
var MyMsg = params[params[1]];
var Type = params[params[2]];
- var entryid = params[params[3]];
+ var ieid = params[params[3]];
//var lentryid = params[params[1]];
///鍔犺浇鏄剧ず鏁版嵁
@@ -231,7 +231,7 @@
var OpenTmp = data[0].妯℃澘鍚嶇О;
console.log(linterid.toString());
//鎵撳紑鎵撳嵃妯℃澘
- window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString() + "&entryid=" + entryid);
+ window.open("../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString() + "&ieid=" + ieid);
//鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴
var url = "";
switch (Type) {
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 37cf596..d729fa0 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -26,53 +26,53 @@
<div carousel-item="">
<ul class="layui-row layui-col-space10 layui-this">
<li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
+ <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<i class="layui-icon layui-icon-add-circle"></i>
- <cite>澶栬喘鍏ュ簱</cite>
+ <cite>鐢熶骇璁㈠崟缁存姢</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">
<i class="layui-icon layui-icon-mike"></i>
- <cite>濮斿鍏ュ簱</cite>
+ <cite>宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">
<i class="layui-icon layui-icon-android"></i>
- <cite>浜у搧鍏ュ簱</cite>
+ <cite>娲惧伐鍗曠淮鎶�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
<i class="layui-icon layui-icon-chart"></i>
- <cite>棰嗘枡鍑哄簱</cite>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-theme"></i>
- <cite>濮斿鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>閿�鍞嚭搴�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-release"></i>
- <cite>璋冩嫧鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
+ <a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">
<i class="layui-icon layui-icon-app"></i>
<cite>鏉＄爜鐢熸垚</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">
+ <i class="layui-icon layui-icon-theme"></i>
+ <cite>宸ュ簭鍒楄〃</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>宸ヤ綔涓績鍒楄〃</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
+ <i class="layui-icon layui-icon-release"></i>
+ <cite>鐗╂枡鍒楄〃</cite>
+ </a>
+ </li>
</ul>
<ul class="layui-row layui-col-space10">
<li class="layui-col-xs3">
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index f276d32..7569b5a 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -123,12 +123,12 @@
<cite>鍑虹珯姹囨姤</cite>
</a>
</li>
- <li class="layui-col-xs3">
+ <!--<li class="layui-col-xs3">
<a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
<i class="layui-icon layui-icon-align-center"></i>
<cite>閲囪喘鍏ュ簱</cite>
</a>
- </li>
+ </li>-->
<!--<li class="layui-col-xs3">
@@ -215,12 +215,12 @@
<cite>閿�鍞嚭搴撴牎楠�</cite>
</a>
</li>
- <!--<li class="layui-col-xs3">
+ <li class="layui-col-xs3">
<a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
<i class="layui-icon layui-icon-addition"></i>
<cite>鐢熶骇琛ユ枡</cite>
</a>
- </li>-->
+ </li>
<li class="layui-col-xs3">
<a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
<i class="layui-icon layui-icon-align-center"></i>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 4d1ebb0..384c098 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -1268,6 +1268,8 @@
}
});
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
@@ -1348,6 +1350,8 @@
}
});
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 75fce77..2dafc0c 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -273,9 +273,9 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
//#endregion
-
+
var rowdata = [{
- "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0,"HPackQty":0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
}];
@@ -287,7 +287,7 @@
var AddRow = table.cache['mainTable'];
var NewRow = {
- "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+ "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
};
//console.log(NewRow);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint_GXPG.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint_GXPG.html"
index 9d5f39f..6c6fa70 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint_GXPG.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint_GXPG.html"
@@ -59,7 +59,7 @@
var value = params[params[0]];
var Type = params[params[1]];
var OpenTmp = params[params[2]];
- var entryid = params[params[3]];
+ var ieid = params[params[3]];
switch (Type) {
@@ -197,7 +197,7 @@
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchRecordBackBillList.aspx?linterid=" + value, true, "");
break;
case "HProcSendWork"://宸ュ簭娲惧伐鍗�
- CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchSendWorkBillList.aspx?linterid=" + value + "&&entryid=" + entryid, true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcExchSendWorkBillList.aspx?linterid=" + value + "&&ieid=" + ieid, true, "");
break;
case "HEmployee"://鑱屽憳鍒楄〃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_EmployeeList.aspx?linterid=" + value, true, "");
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx"
index cbc264a..92feb17 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcExchSendWorkBillList.aspx"
@@ -14,7 +14,7 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_ProcExchSendWorkBillList where hmainid in("+Request.Params["linterid"] + ")" + "and hentryid in("+Request.Params["entryid"] + ")" ,"select 1");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_ProcessExchangeIssueBillQuery where hmainid in("+Request.Params["linterid"] + ")" + "and ieid in("+Request.Params["ieid"] + ")" ,"select 1");
}
</script>
</head>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index b9aabe4..520265f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -274,7 +274,7 @@
, height: 'full-50'
, page: true
, cellMinWidth: 90
- , limits: [50, 500, 5000, 20000]
+ , limits: [50, 500, 5000, 20000,50000]
, limit: 50
, cols: [[
{ type: 'checkbox', fixed: 'left' }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index b76378d..d4fc9e0 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -165,7 +165,7 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<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="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -194,58 +194,17 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎴愬搧缂栧彿</label>
<div class="layui-input-block" style="margin-left: 115px;">
<input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
</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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" 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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">
- <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
- </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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" 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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
- </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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0"> <!--style="background-color:#efefef4d;"-->
- </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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
- </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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
</div>
</div>
<div class="layui-inline">
@@ -256,6 +215,47 @@
</select>
</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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" 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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
+ <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
+ <!--</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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
+ </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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">--> <!--style="background-color:#efefef4d;"-->
+ <!--</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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
+ <!--</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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
+ <!--</div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -484,9 +484,7 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
- , { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
, { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
- //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
, { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
, { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
, { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
@@ -497,14 +495,24 @@
, { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
, { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
+ , { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
// , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }//涓嶅～
- // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', edit: 'text', event: "CheckHCenterID" }//f7
- // , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', edit: 'text', width: 110, event: "CheckHSupID" }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
+ // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
+ //, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
+ , { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
+ // , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
+ , { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
+ // , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
+ , { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
+ //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+ // , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
, { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
@@ -529,16 +537,8 @@
, { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
, { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
, { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
- , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
, { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
- //, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
- , { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
- // , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
- , { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
- // , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
- , { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
//, 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\345\207\272\347\253\231\346\261\207\346\212\245\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\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 4af62c6..eed01da 100644
--- "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\346\261\207\346\212\245\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\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -753,7 +753,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-50'
, page: true
, totalRow: true
, cellMinWidth: 90
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index 6b69e4b..d0f8041 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -101,7 +101,7 @@
th {
width: 70px;
- text-align: center;
+ text-align: left;
}
</style>
</head>
@@ -115,9 +115,9 @@
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</span>
</div>
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
- <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
<div class="layui-form-item">
@@ -134,23 +134,49 @@
</td>
</tr>
<tr>
- <th>娴佹按鍙�</th>
+ <th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+ <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>褰撳墠宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
<th>鍚堟牸鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;height:55px">
</td>
</tr>
<tr>
<th>鎶ュ簾鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
</td>
</tr>
<tr>
@@ -180,7 +206,7 @@
<tr>
<th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
</td>
<td class="bz_td">
<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -197,16 +223,28 @@
</td>
</tr>
<tr>
- <th>鍗曟嵁鏃ユ湡</th>
- <td class="t1_input">
- <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
+ <th>娴佽浆鍗″彿</th>
+ <td class="bz_td">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
- <th>鍗曟嵁鍙�</th>
+ <th>娴佽浆鍗℃暟閲�</th>
+ <td class="bz_td" readonly>
+ <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鏈嚭绔欐暟閲�</th>
<td class="bz_td">
- <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>璁㈠崟鏁伴噺</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
@@ -236,48 +274,16 @@
</td>
</tr>
<tr>
- <th>浜у搧鍚嶇О</th>
+ <th>鍗曟嵁鍙�</th>
<td class="bz_td">
- <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
- <th>瑙勬牸鍨嬪彿</th>
- <td class="bz_td">
- <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>娴佽浆鍗″彿</th>
- <td class="bz_td">
- <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
- </td>
- </tr>
- <tr>
- <th>娴佽浆鍗℃暟閲�</th>
- <td class="bz_td" readonly>
- <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>鏈嚭绔欐暟閲�</th>
- <td class="bz_td">
- <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>璁㈠崟鏁伴噺</th>
- <td class="bz_td">
- <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th>褰撳墠宸ュ簭</th>
- <td class="bz_td">
- <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
</td>
</tr>
<tr>
@@ -408,7 +414,7 @@
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
$('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤鏄庣粏鎸夐挳
-
+ $("#Add").attr("style", "display:none;");//闅愯棌鏂板鎸夐挳
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
* 2.鏈夋簮鍗曟柊澧�
@@ -571,6 +577,7 @@
"HQCCheckName": data.HQCCheckName,
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
+ "HEmpName_second": data.HEmpName,
"HEmpID2": data.HEmpID2,
"HEmpName2": data.HEmpName2,
"HEmpID3": data.HEmpID3,
@@ -624,7 +631,8 @@
"HCenterName": data.宸ヤ綔涓績鍚嶇О,
"HEmpID": data.HEmpID,
"HEmpNumber": data.鎿嶄綔鍛樹唬鐮�,
- "HEmpName": data.鎿嶄綔鍛樺悕绉�
+ "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+ "HEmpName_second": data.鎿嶄綔鍛樺悕绉�
});
layer.close(index);
}
@@ -705,6 +713,7 @@
"HCenterID": data.HCenterID,
"NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
+ $("#HProcNo").attr('disabled', 'disabled');
HProcExchBillNoFlag = true;
break;
case "GXLX":
@@ -725,10 +734,16 @@
"HPRDOrgID": data.缁勭粐,
"HPRDOrg": data.缁勭粐鍚嶇О,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HProcNo": data.宸ュ簭鍙�,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
+ $("#HProcNo").attr('disabled', 'disabled');
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -814,6 +829,7 @@
"HEmpID": data.HItemID,
"HEmpNumber": data.鑱屽憳浠ｇ爜,
"HEmpName": data.鑱屽憳鍚嶇О,
+ "HEmpName_second": data.鑱屽憳鍚嶇О,
"HGroupID": data.鐝粍ID,
"HGroupName": data.鐝粍鍚嶇О
});
@@ -1112,7 +1128,7 @@
//娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
$('#HProcNo').on('keydown', function (event) {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (event.keyCode == 13) {
if (!HProcExchBillNoFlag) {
layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
@@ -1327,6 +1343,8 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ $("#Add").attr("style", "display:inline;");//鏄剧ず鏂板鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
if (sessionStorage["OrganizationID"] == 100038) {
if (FirstEndHProcNo == 1) {
//姹囨姤
@@ -1583,6 +1601,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName_second").val(checkStatus.data[0].HName);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2141,6 +2160,7 @@
//杩斿洖鎿嶄綔鍛�
function GetHWorkerValue(obj) {
$("#HEmpName").val(obj[0].HName);
+ $("#HEmpName_second").val(obj[0].HName);
$("#HEmpID").val(obj[0].HItemID);
}
//杩斿洖鎿嶄綔鍛�2
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/MES_StationOutBill_PDA_Detail.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/MES_StationOutBill_PDA_Detail.html"
index 879d395..5a4402e 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/MES_StationOutBill_PDA_Detail.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/MES_StationOutBill_PDA_Detail.html"
@@ -279,7 +279,7 @@
switch (field) {
case 'HQty':
obj.update({
- HMoney: HProcPrice * HQty //宸ヨ祫=宸ヤ环 * 鏁伴噺
+ HMoney: obj.data.HProcPrice * obj.data.HQty //宸ヨ祫=宸ヤ环 * 鏁伴噺
});
break;
}
@@ -410,54 +410,56 @@
//#endregion
function set_GridCellCheck(obj) {
+ var data = obj.data;
var employeeBar;
- var employeeName;
- table.on('edit(mainTable)', function (obj) {
- employeeBar = obj.value;
- obj.update({
- "HMoney": obj.data.HProcPrice * obj.data.HQty
- })
- $("#HPlanQty").focus();
- $(document).on('keydown', '.layui-table-edit', function (event) {
- if (event.keyCode == 13) {
- var data = obj.data;
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
- type: "GET",
- async: false,
- data: { "HBarCode": employeeBar, "HInterID": HProcExchHinteID, "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
- success: function (result) {
- if (result.count == 1) {
- $("#HPlanQty").focus();
- obj.update({
- "HWorkEmpID": result.data[0].HItemID,
- "HWorkName": result.data[0].鑱屽憳鍚嶇О,
- "HRate": result.data[0].鑱屽憳绯绘暟
- })
- layer.close(index);
- return;
- }
- else {
- layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
+ if (obj.event === 'HWorkName') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ /*if (!val) val = "0";*/
+ //$input.val(val.replace(/[^\d]/g, ''));
+ employeeBar = val;//鍗曞厓瀹炴椂鏍兼暟鎹�
+ });
+ }
+ //鍥炶溅/鎵爜 鑾峰彇鑱屽憳鍚嶇О
+ $(document).on('keydown', '.layui-table-edit', function (event) {
+ if (event.keyCode == 13) {
+ var data = obj.data;
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
+ type: "GET",
+ async: false,
+ data: { "HBarCode": employeeBar, "HInterID": HProcExchHinteID, "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HPlanQty").focus();
+ obj.update({
+ "HWorkEmpID": result.data[0].HItemID,
+ "HWorkName": result.data[0].鑱屽憳鍚嶇О,
+ "HRate": result.data[0].鑱屽憳绯绘暟
+ })
layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
}
- });
-
- setTimeout(function () {
-
- }, 1000);
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
- obj.event = "";
- return false;
- }
- })
- });
+ setTimeout(function () {
+
+ }, 1000);
+
+ obj.event = "";
+ return false;
+ }
+ })
}
//浠ヤ笂涓簂ayui妯″潡
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_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
index 35c7a48..841bf1d 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_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
@@ -96,6 +96,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><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-file-b"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
@@ -744,7 +745,7 @@
} else {
layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
}
- }
+ }
//#region 鎸囨淳鏃ユ湡
function set_PlanDate() {
@@ -840,7 +841,16 @@
function get_print() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ var arr = [];
+ var ieid = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].hmainid.toString());
+ arr.push(data[i].HEntryID.toString());
+ ieid.push(data[i].hmainid.toString() + data[i].HEntryID.toString())
+ }
+
layer.open({
type: 2
, area: ['50%', '50%']
@@ -848,7 +858,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
, resize: false
})
}
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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
index 468f0b3..0c67ccb 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_ProcessSendWorkEdit.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_ProcessSendWorkEdit.html"
@@ -90,35 +90,25 @@
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</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="HPRDORGName" id="HPRDORGName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchORG" id="btnSearchORG" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ </div>
<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">娲惧伐鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input" name="HDate" id="HDate">
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎽樿</label>
+ <div class="layui-row">
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">鎽樿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;width:600px;">
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;width:600px;">
</div>
</div>
<div class="layui-col-xs3 layui-inline" style="display:none">
@@ -303,6 +293,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
+ "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
"HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
@@ -581,6 +572,11 @@
}
});
+ //鎵撳嵃
+ form.on('submit(btn_print)', function (data) {
+ get_print(data);
+ });
+
//閫夋嫨鐢熶骇杞﹂棿寮圭獥
form.on('submit(btnSearchWorkShop)', function () {
layer.open({
@@ -655,8 +651,18 @@
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HMainID', title: '娲惧伐鍗曚富ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+ , { field: 'HEntryID', title: '娲惧伐鍗曞瓙ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+ , { field: 'HSourceInterID', title: '娴佽浆鍗D', hide: true }
+ , { field: 'HSourceEntryID', title: '娴佽浆鍗″瓙ID', hide: true }
+ , { field: 'HSourceBillNo', title: '娴佽浆鍗″彿', width: 165 }
+ , { field: 'HSourceBillType', title: '鍗曟嵁绫诲瀷', hide: true }
, { field: 'HProcNo', title: '娴佹按鍙�' }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
+ , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
+ , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+ , { field: 'HPlanBeginDate', title: '瑕佹眰寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
+ , { field: 'HPlanEndDate', title: '瑕佹眰瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
, { field: 'HMaterID', title: '浜у搧ID', hide: true }
, { field: 'HMaterNumber', title: '浜у搧浠ｇ爜', edit: 'text', event: "HMaterCheck" }
, { field: 'HMaterName', title: '浜у搧鍚嶇О' }
@@ -668,16 +674,12 @@
, { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
, { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
- , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck" }
- , { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�' }
+ , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: true }
+ , { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�', hide: true }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
- , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck" }
- , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
- , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
- , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck", hide: true}
+ , { field: 'HGroupName', title: '鐝粍鍚嶇О', hide: true}
, { field: 'HBatchNo', title: '鎵规', edit: 'text' }
- , { field: 'HPlanBeginDate', title: '瑕佹眰寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
- , { field: 'HPlanEndDate', title: '瑕佹眰瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
, { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿', hide: true }
, { field: 'HICMOInterID', title: '浠诲姟鍗旾D', hide: true }
, { field: 'HICMOEntryID', title: '浠诲姟鍗曞瓙鍐呯爜', hide: true }
@@ -712,6 +714,7 @@
}
};
option.data = [{
+ "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
"HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
"HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
@@ -749,6 +752,7 @@
for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
+ "HSourceInterID": result.data[i]["hmainid"], "HSourceEntryID": result.data[i]["HEntryID"], "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"], "HSourceBillType": result.data[i]["HBillType"],
"HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["鍗曚綅"],
"HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮"], "HWorkerID": result.data[i]["HWorkerID"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸�"],
"HGroupID": result.data[i]["HGroupID"], "HGroupNumber": result.data[i]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
@@ -777,7 +781,6 @@
//淇濆瓨HMaker
function set_AddNew(data) {
-
var num_1 = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -785,11 +788,9 @@
num_1.push(table.cache["mainTable"][i])
}
}
-
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num_1);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
-
var index = layer.load();
$.ajax({
type: "POST",
@@ -855,6 +856,11 @@
})
}
+ //鎵撳嵃
+ function get_print(data) {
+
+ }
+
function get_UrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
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_ProcessSendWorkList.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_ProcessSendWorkList.html"
index 8cbe3c7..a850541 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_ProcessSendWorkList.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_ProcessSendWorkList.html"
@@ -266,7 +266,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-50'
, page: true //寮�鍚垎椤�
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -450,9 +450,11 @@
if (checkStatus.data.length >= 1) {
var rows = [];
var arr = [];
+ var ieid = [];
for (var i = 0; i < data.length; i++) {
rows.push(data[i].hmainid.toString());
arr.push(data[i].hentryid.toString());
+ ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
}
layer.open({
@@ -462,7 +464,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList _GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&entryid=' + arr.toString(), 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
, resize: false
})
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 70c56b9..93d54f2 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -1046,6 +1046,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
table.reload('wl-table', {
where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
});
@@ -1080,6 +1082,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
layer.msg(data.Message, { icon: 1, btn: ['纭'], time: 100000, title: "娓╅Θ鎻愮ず" });
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
@@ -1240,6 +1244,8 @@
}
});
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index b310071..d9ae536 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -36,6 +36,14 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-EntrustOutBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -175,14 +183,14 @@
<!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
- </div>
+ </div>-->
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
@@ -1000,6 +1008,8 @@
layer.closeAll("loading");
}
});
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index a670cf9..5cb975b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1290,6 +1290,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
table.reload('wl-table', {
where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
});
@@ -1324,6 +1326,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
layer.msg(data.Message, { icon: 1, btn: ['纭'], time: 100000, title: "娓╅Θ鎻愮ず" });
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
table.render({
elem: '#wl-table'
, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
@@ -1524,6 +1528,8 @@
//$("#HSumQtys").val(count);
//$("#HBarCodeQtys").val(count1);
playSound1();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
// $("#verifycode").click();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 8736573..869e478 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -1163,6 +1163,8 @@
layer.closeAll("loading");
}
});
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index a6fdc12..cbbb0bd 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -1223,6 +1223,8 @@
layer.closeAll("loading");
}
})
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
@@ -1431,6 +1433,8 @@
layer.closeAll("loading");
}
});
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index 09ea7e1..eaafb56 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -39,7 +39,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
- <div class="layui-col-xs8">
+ <div class="layui-col-xs5">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
</div>
@@ -1224,6 +1224,8 @@
layer.closeAll("loading");
}
});
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
// $("#verifycode").click();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 8e13c4f..e2544f4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -41,11 +41,19 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
- <div class="layui-col-xs5">
+ <div class="layui-col-xs8">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -203,14 +211,14 @@
<div class="layui-row">
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
- </div>
+ </div>-->
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
@@ -885,6 +893,40 @@
// layer.msg($('#HSourceBillNo').val(), { icon: 1 });
}
});
+
+ //鎵粨搴�
+ $('#HWHNAME').on('keydown', function (event) {
+ var HBarCode = $('#HWHNAME').val()
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg('鏃犱粨搴撴潯鐮佷俊鎭紒');
+ return;
+ }
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getWHName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //$("#HStockPlaceName").val(result.data[0].HName);
+ //$("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHID").val(result.data[0].HItemID);
+ $("#HWHNAME").val(result.data[0].HName);
+ element.tabChange('tab-POStockInBill', '2');
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
+
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
@@ -1108,6 +1150,9 @@
layer.closeAll("loading");
}
});
+
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
playSound();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 537ec72..5319e0c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -45,6 +45,14 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-Kf_EntrustInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -200,14 +208,14 @@
<div class="layui-row">
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
</div>
- </div>
+ </div>-->
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
@@ -644,7 +652,7 @@
// sQty = 0;
//}
if (event.keyCode == 13) {
- GetMeesageByBarCode
+ GetMeesageByBarCode();
}
});
//纭畾
@@ -882,6 +890,8 @@
layer.closeAll("loading");
}
});
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
}
else {
// $("#verifycode").click();
--
Gitblit v1.9.1