MES-WEB-LayUI.git

parent: c73297cf | 补丁 | 提交 | show whitespace

yangle

2024-06-06 d6db3fa707f470fd8a6160c6daf6bcea75b8a6ce

上下模单优化

4个文件已修改

	WebTM/App_Data/MssqlReportData.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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;";//ä¹ä¸æµè¯

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/ÉÏÄ£µ¥/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({

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/ÉÏÄ£µ¥/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,7 +590,6 @@

                            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="" å¯¹åºçå¼
@@ -595,22 +601,7 @@
                                    "HICMOEntryID": data.HICMOEntryID
                                });
                            }

                            switch (BillNoType5) {
                                //æµè½¬å¡
                                case "GXLX":
                                    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
                                    });
                                    break;
                            }

                         

                            $("#HBarCode").val("");
                            layer.close(index);

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/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 () {

			@@ -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;";//ä¹ä¸æµè¯

			@@ -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({

			@@ -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,7 +590,6 @@

			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="" å¯¹åºçå¼
			@@ -595,22 +601,7 @@
			"HICMOEntryID": data.HICMOEntryID
			});
			}

			switch (BillNoType5) {
			//æµè½¬å¡
			case "GXLX":
			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
			});
			break;
			}



			$("#HBarCode").val("");
			layer.close(index);

			@@ -150,7 +150,7 @@
			</html>
			<script>
			layui.config({
			base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			base: '../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {