From d6db3fa707f470fd8a6160c6daf6bcea75b8a6ce Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 06 六月 2024 15:18:45 +0800
Subject: [PATCH] 上下模单优化
---
WebTM/App_Data/MssqlReportData.cs | 3 ++-
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 2 +-
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 27 +++++++++------------------
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 2 +-
4 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 71758f7..98c3496 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,8 @@
//public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
- public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+ //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+ public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
//public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
//public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
//public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴娴嬭瘯
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index dd748f4..96d21fc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -503,7 +503,7 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
- HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
+ //HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
var sWhere = " and 鏉″舰鐮�='" + HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index fae952a..73c0d33 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -522,6 +522,7 @@
//鐢熶骇璧勬簮
case "BM":
case "SS":
+ case "10":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HSourceID": data.HItemID,
"HSourceName": data.HName,
@@ -548,6 +549,12 @@
"HMouldName": data.妯″叿鍚嶇О,
"HMouldModel": data.妯″叿鍨嬪彿,
"HQty": 1,
+ });
+ break;
+ case "CMR":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSourceID": data.HItemID,
+ "HSourceName": data.HName,
});
break;
}
@@ -583,22 +590,8 @@
if (BillNoType5.length == 8) {
BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
- }
- if (isValidDate(BillNoType5)) {
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchInterID": data.hmainid,
- "HProcExchEntryID": data.HEntryID,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HICMOInterID": data.hicmointerid,
- "HICMOEntryID": data.HICMOEntryID
- });
- }
-
- switch (BillNoType5) {
- //娴佽浆鍗�
- case "GXLX":
+ if (isValidDate(BillNoType5)) {
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HProcExchInterID": data.hmainid,
@@ -607,10 +600,8 @@
"HICMOInterID": data.hicmointerid,
"HICMOEntryID": data.HICMOEntryID
});
- break;
+ }
}
-
-
$("#HBarCode").val("");
layer.close(index);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index e7da65b..284afab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -150,7 +150,7 @@
</html>
<script>
layui.config({
- base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
--
Gitblit v1.9.1