| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\å端代ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@ //var WEBURL = "http://192.168.16.80:8011/"; //åå ¬å®¤æå¡å¨ //var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°é ç½® var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost/WEBAPI/"; //é¢å®¶å°å¼æºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°é ç½® //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW //var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨ WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -1426,9 +1426,12 @@ //} // $.ajax({ url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json", url: GetWEBURL() + "/WEBSController/Get_BarCode_Json", type: "GET", data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle }, data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" }, //url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json", //type: "GET", //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle }, success: function (result) { playSound1(); if (result.count == 1) { @@ -1437,7 +1440,7 @@ $("#HWHID").val(result.data.hWhIDField); $("#HStockPlaceName").val(""); $("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç "); element.tabChange('tab-Kf_SellOutBill', '3'); //è·³è½¬é¡µç¾ element.tabChange('tab-SellOutBill', '2'); //è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'ä»ä½æ¡ç ') { @@ -1446,61 +1449,82 @@ $("#HWHNAME").val(result.data.hWhNameField); $("#HWHID").val(result.data.hWhIDField); $("#HNote").val(";ä¸é®æ«ç ä»ä½æ¡ç "); element.tabChange('tab-Kf_SellOutBill', '3');//è·³è½¬é¡µç¾ element.tabChange('tab-SellOutBill', '2');//è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'é¨é¨æ¡ç ') { $("#HDeptName").val(result.data.hDeptNameField); $("#HDeptID").val(result.data.hDeptIDField); $("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç "); element.tabChange('tab-Kf_SellOutBill', '3');//è·³è½¬é¡µç¾ element.tabChange('tab-SellOutBill', '2');//è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'æºåæ¡ç ') { //$("#HSupName").val(result.data.hSupName); $("#HSupName").val(result.data.hSupNameField); $("#HSupID").val(result.data.hSupIDField); //$("#HDeptName").val(result.data.hDeptName); $("#HDeptID").val(result.data.hDeptIDField); if (result.data.hDeptIDField != 0) { $("#HDeptID").val(result.data.hDeptIDField); $("#HDeptName").val(result.data.hDeptNameField); } $("#HSourceBillNo").val(result.data.hSourceBillNoField); HSourceFlag = true; //è·åæºåç±»åãæºååå· $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1402" : result.data.hSourceBillTypeField); if (result.data.hSourceBillTypeField == "1402") { $("#HBillType").empty(); $("#HBillType").val("1402"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'åè´§éç¥å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else if (result.data.hSourceBillTypeField == "1401") { $("#HBillType").empty(); $("#HBillType").val("1401"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'éå®è®¢å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else { $("#HBillType").val("æå·¥å½å ¥"); //$("#HBillType").empty(); $("#HBillType").val("-1"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å ¥' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } $("#HSourceBillNo").attr("readonly", "readonly"); $("#HNote").val(";ä¸é®æ«ç æºåæ¡ç "); element.tabChange('tab-Kf_SellOutBill', '3'); element.tabChange('tab-SellOutBill', '3'); } else { if (HSourceFlag == "true") { element.tabChange('tab-Kf_SellOutBill', '3'); element.tabChange('tab-SellOutBill', '3'); } else { //$("#HSupName").val(result.data.HSupName); $("#HSupID").val(result.data.HSupID); //$("#HSupID").val(result.data.HSupID); //$("#HDeptName").val(result.data.HDeptName); $("#HDeptID").val(result.data.HDeptID); $("#HSourceBillNo").val(result.data.HSourceBillNo); //$("#HDeptID").val(result.data.HDeptID); //$("#HSourceBillNo").val(result.data.HSourceBillNo); HSourceFlag = true; //è·åæºåç±»åãæºååå· if (result.data.HSourceBillType == "1402") { $("#HBillType").val("1402"); //if (result.data.HSourceBillType == "1402") { // $("#HBillType").val("1402"); } else if (result.data.HSourceBillType == "1401") { $("#HBillType").val("1401"); } //} //else if (result.data.HSourceBillType == "1401") { // $("#HBillType").val("1401"); //} //else if (result.data.HSourceBillType == "1601") { // $("#HBillType").val("1601"); //} $("#HNote").val(";ç©ææ¡ç "); element.tabChange('tab-Kf_SellOutBill', '3'); element.tabChange('tab-SellOutBill', '3'); } } //$("#HSupID").val(result.data.HSupID); WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -1085,7 +1085,7 @@ $("#HWHID").val(result.data.hWhIDField); $("#HStockPlaceName").val(""); $("#HNote").val(";ä¸é®æ«ç ä»åºæ¡ç "); element.tabChange('tab-MateOutBill', '3'); //è·³è½¬é¡µç¾ element.tabChange('tab-MateOutBill', '2'); //è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'ä»ä½æ¡ç ') { @@ -1094,22 +1094,24 @@ $("#HWHNAME").val(result.data.hWhNameField); $("#HWHID").val(result.data.hWhIDField); $("#HNote").val(";ä¸é®æ«ç ä»ä½æ¡ç "); element.tabChange('tab-MateOutBill', '3');//è·³è½¬é¡µç¾ element.tabChange('tab-MateOutBill', '2');//è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'é¨é¨æ¡ç ') { $("#HDeptName").val(result.data.hDeptNameField); $("#HDeptID").val(result.data.hDeptIDField); $("#HNote").val(";ä¸é®æ«ç é¨é¨æ¡ç "); element.tabChange('tab-MateOutBill', '3');//è·³è½¬é¡µç¾ element.tabChange('tab-MateOutBill', '2');//è·³è½¬é¡µç¾ return; } else if (result.data.hBarTypeField == 'æºåæ¡ç ') { $("#HSupName").val(result.data.hSupNameField); $("#HSupID").val(result.data.hSupIDField); $("#HDeptName").val(result.data.hDeptNameField); $("#HDeptID").val(result.data.hDeptIDField); $("#HSourceBillNo").val(result.data.hSourceBillNoFieldField); if (result.data.hDeptIDField != 0) { $("#HDeptID").val(result.data.hDeptIDField); $("#HDeptName").val(result.data.hDeptNameField); } $("#HSourceBillNo").val(result.data.hSourceBillNoField); HSourceFlag = true; //è·åæºåç±»åãæºååå· $("#HBillType").val(result.data.hSourceBillTypeField == null ? "3720" : result.data.hSourceBillTypeField); WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -1332,23 +1332,45 @@ return; } else if (result.data.hBarTypeField == 'æºåæ¡ç ') { //$("#HSupName").val(result.data.hSupName); //$("#HSupID").val(result.data.hSupID); //$("#HDeptName").val(result.data.hDeptName); //$("#HDeptID").val(result.data.hDeptID); if (result.data.hDeptIDField != 0) { $("#HDeptID").val(result.data.hDeptIDField); $("#HDeptName").val(result.data.hDeptNameField); } $("#HSourceBillNo").val(result.data.hSourceBillNoField); HSourceFlag = true; $("#HBillType").val(result.data.hSourceBillTypeField == null ? "3714" : result.data.hSourceBillTypeField); //è·åæºåç±»åãæºååå· //if (result.data.HSourceBillType == "3711") { // $("#HBillType").val("3711"); //} //else { // $("#HBillType").val("-1"); //} if (result.data.hSourceBillTypeField == "3711") { $("#HBillType").empty(); $("#HBillType").val("3711"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'ç产æ±æ¥å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else if (result.data.hSourceBillTypeField == "3710") { $("#HBillType").empty(); $("#HBillType").val("3710"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'ç产订å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else if (result.data.hSourceBillTypeField == "3714") { $("#HBillType").empty(); $("#HBillType").val("3714"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å·¥åºæ±æ¥å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else { //$("#HBillType").val("-1"); } $("#HSourceBillNo").attr("readonly", "readonly"); $("#HNote").val(";ä¸é®æ«ç æºåæ¡ç "); element.tabChange('tab-ProductlnBill', '3'); } WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html
@@ -1064,22 +1064,35 @@ else if (result.data.hBarTypeField == 'æºåæ¡ç ') { $("#HSupName").val(result.data.hSupNameField); $("#HSupID").val(result.data.hSupIDField); $("#HDeptName").val(result.data.hDeptNameField); $("#HDeptID").val(result.data.hDeptIDField); if (result.data.hDeptIDField != 0) { $("#HDeptID").val(result.data.hDeptIDField); $("#HDeptName").val(result.data.hDeptNameField); } $("#HSourceBillNo").val(result.data.hSourceBillNoField); $("#HBillType").val(result.data.hSourceBillTypeField) sessionStorage["SourceFlag"] = true; HSourceFlag = true; //è·åæºåç±»åãæºååå· if (result.data.hSourceBillTypeField == "1102") { $("#HBillType").empty(); $("#HBillType").val("1102"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'éè´è®¢å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else if (result.data.hSourceBillTypeField == "1103") { if (result.data.hSourceBillTypeField == "1103") { $("#HBillType").empty(); $("#HBillType").val("1103"); var optionHtml = ''; optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æ¶æéç¥å' + "</option>"; $("#HBillType").append(optionHtml); layui.form.render('select'); $("#HBillType").attr("readonly", "readonly"); } else { $("#HBillType").val("æå·¥å½å ¥"); //$("#HBillType").val("-1"); } $("#HSourceBillNo").attr("readonly", "readonly"); $("#HNote").val(";ä¸é®æ«ç æºåæ¡ç "); element.tabChange('tab-POStockInBill', '3'); } @@ -1094,6 +1107,7 @@ //$("#HDeptID").val(result.data.HDeptID); //$("#HSourceBillNo").val(result.data.hSourceBillNoField); //$("#HBillType").val(result.data.hSourceBillTypeField) $("#HSourceBillNo").val(result.data.hSourceBillNoField); HSourceFlag = true; //è·åæºåç±»åãæºååå· if (result.data.hSourceBillTypeField == "1102") {
