MES-WEB-LayUI.git

parent: 1275962d | 补丁 | 提交 | ignore whitespace

yangle

2022-07-29 029404c7d0fb04afc46373e3d58069397cf96cdb

工序流转卡  功能维护

5个文件已修改

	WebTM/App_Data/MssqlReportData.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/工资基础资料/Gy_Group.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/App_Data/MssqlReportData.cs

@@ -20,8 +20,9 @@
    //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;";//ä¸¸äº
    public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¸¸äºå°å
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¸¸äºå°å
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//éçªè¯ºæµè¯
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ççª

    //public string sServer;
    //public string sDataBase;

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -306,9 +306,9 @@
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'Gy_Group/EditBill',
                            url: GetWEBURL() + '/Gy_Group/DeltetGy_Group',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -56,27 +56,34 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                            <div class="layui-inline">
                                                <span>å¶ä»æ¡ä»¶></span>
                                            </div>
                                        </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="HWorkBillNo" id="HWorkBillNo">
                                        <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="HWorkBillNo" id="HWorkBillNo">
                                            </div>
                                        </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="HBillNo" id="HBillNo">
                                        <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="HBillNo" id="HBillNo">
                                            </div>
                                        </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="HProcExchBillNo" id="HProcExchBillNo">
                                        <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="HProcExchBillNo" id="HProcExchBillNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 10px;">
                                                <input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="æ¥åºæ°éä¸ä¸º0">
                                            </div>
                                        </div>
                                    </div>
                                </div>
@@ -187,6 +194,7 @@
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 125 }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
                        , { field: 'å¶åäºº', title: 'å¶åäºº' }
                        , { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 125 }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: 'å½åå·¥åºä»£ç ', title: 'å½åå·¥åºä»£ç ', width: 125 }
@@ -434,6 +442,8 @@
                var HWorkBillNo = $("#HWorkBillNo").val();
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) >= '" + HBeginDate + "'";
                }
@@ -449,6 +459,12 @@
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (checkHWasterQty) {
                    sWhere += "  and æ¥åºæ°é>0 ";
                }
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBill.html

@@ -351,7 +351,18 @@
                                                <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </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="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </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="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBillList.html

@@ -363,6 +363,10 @@
                        , { field: 'HProcID', title: 'HProcID', hide: true}
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
                        , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width:100 }
                        , { field: 'è¿ç«å³èæ°é', title: 'è¿ç«å³èæ°é', width: 120 }
                        , { field: 'åºç«å³èæ°é', title: 'åºç«å³èæ°é', width: 120 }
                        , { field: 'åºç«æ¥åºå³èæ°é', title: 'åºç«æ¥åºå³èæ°é', width: 150 }
                        , { field: 'è¿å·¥æ è®°', title: 'è¿å·¥æ è®°' }
                        , { field: 'å å·¥è¯´æ', title: 'å å·¥è¯´æ' }
                        , { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115 }
@@ -370,9 +374,9 @@
                        , { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
                        , { field: 'hmainid', title: 'hmainid', hide: true}
                        , { field: 'æ¥æ', title: 'æ¥æ', sort: true }
                        , { field: 'åæ®å·', title: 'åæ®å·' }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
                        , { field: 'hicmointerid', title: 'hicmointerid', hide: true}
                        , { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·' }
                        , { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·', width: 100}
                        , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
                        , { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
                        , { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´' }
@@ -394,10 +398,6 @@
                        , { field: 'å§å¤å å·¥åä½', title: 'å§å¤å å·¥åä½' }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
                        , { field: 'HBillType', title: 'HBillType', hide: true}
                        , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
                        , { field: 'è¿ç«å³èæ°é', title: 'è¿ç«å³èæ°é' }
                        , { field: 'åºç«å³èæ°é', title: 'åºç«å³èæ°é' }
                        , { field: 'åºç«æ¥åºå³èæ°é', title: 'åºç«æ¥åºå³èæ°é' }
                        , { field: 'è¡å³éäºº', title: 'è¡å³éäºº' }
                        , { field: 'å³éç±»å', title: 'å³éç±»å' }
                        , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }

			@@ -20,8 +20,9 @@
			//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;";//ä¸¸äº
			public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¸¸äºå°å
			//public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¸¸äºå°å
			//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//éçªè¯ºæµè¯
			public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ççª

			//public string sServer;
			//public string sDataBase;

			@@ -306,9 +306,9 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'Gy_Group/EditBill',
			url: GetWEBURL() + '/Gy_Group/DeltetGy_Group',
			type: "GET",
			data: { "HItemID": ItemID },
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 }, function () {

			@@ -56,27 +56,34 @@
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</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="HWorkBillNo" id="HWorkBillNo">
			<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="HWorkBillNo" id="HWorkBillNo">
			</div>
			</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="HBillNo" id="HBillNo">
			<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="HBillNo" id="HBillNo">
			</div>
			</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="HProcExchBillNo" id="HProcExchBillNo">
			<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="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 10px;">
			<input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="æ¥åºæ°éä¸ä¸º0">
			</div>
			</div>
			</div>
			</div>
			@@ -187,6 +194,7 @@
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 125 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 125 }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'å½åå·¥åºä»£ç ', title: 'å½åå·¥åºä»£ç ', width: 125 }
			@@ -434,6 +442,8 @@
			var HWorkBillNo = $("#HWorkBillNo").val();
			var HBillNo = $("#HBillNo").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) >= '" + HBeginDate + "'";
			}
			@@ -449,6 +459,12 @@
			if (HProcExchBillNo) {
			sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
			}
			if (HProcExchBillNo) {
			sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
			}
			if (checkHWasterQty) {
			sWhere += " and æ¥åºæ°é>0 ";
			}
			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨

			@@ -351,7 +351,18 @@
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</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="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</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="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>

			@@ -363,6 +363,10 @@
			, { field: 'HProcID', title: 'HProcID', hide: true}
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width:100 }
			, { field: 'è¿ç«å³èæ°é', title: 'è¿ç«å³èæ°é', width: 120 }
			, { field: 'åºç«å³èæ°é', title: 'åºç«å³èæ°é', width: 120 }
			, { field: 'åºç«æ¥åºå³èæ°é', title: 'åºç«æ¥åºå³èæ°é', width: 150 }
			, { field: 'è¿å·¥æ è®°', title: 'è¿å·¥æ è®°' }
			, { field: 'å å·¥è¯´æ', title: 'å å·¥è¯´æ' }
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115 }
			@@ -370,9 +374,9 @@
			, { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
			, { field: 'hmainid', title: 'hmainid', hide: true}
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'hicmointerid', title: 'hicmointerid', hide: true}
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·' }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·', width: 100}
			, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´' }
			@@ -394,10 +398,6 @@
			, { field: 'å§å¤å å·¥åä½', title: 'å§å¤å å·¥åä½' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'HBillType', title: 'HBillType', hide: true}
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
			, { field: 'è¿ç«å³èæ°é', title: 'è¿ç«å³èæ°é' }
			, { field: 'åºç«å³èæ°é', title: 'åºç«å³èæ°é' }
			, { field: 'åºç«æ¥åºå³èæ°é', title: 'åºç«æ¥åºå³èæ°é' }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº' }
			, { field: 'å³éç±»å', title: 'å³éç±»å' }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }