MES-WEB-LayUI.git

parent: 0790fd08 | 补丁 | 提交 | ignore whitespace

chenhaozhe

2025-09-02 7ff4b156f02d5f9ab0f02d56fd7f60e32f4ce9bf

修改 领料出库单 毛尖/羊毛染色 允许添加子表仓库

10个文件已修改

	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/委外用料单/WW_PPBomBillList.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/²Ö´æ¹ÜÀí/Î¯ÍâÓÃÁÏµ¥/WW_PPBomBillList.html

@@ -351,7 +351,7 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();        //æ§è¡è¡¨æ ¼åå§åæ¹æ³ 
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery();        //æ§è¡æ¥è¯¢æ¹æ³  
                // get_FastQuery();        //æ§è¡æ¥è¯¢æ¹æ³  
                
                //éèå¾éåæ®µ
                DisPlay_HideColumn();//æ§è¡éèæ¹æ³
@@ -1133,7 +1133,7 @@


                                //æ§è¡æ¥è¯¢æ¹æ³
                                get_FastQuery();  
                                // get_FastQuery();  
                            } else {
                                $('#HBeginDate').prop('disabled', false);   //å¼å§æ¶é´å¯èªé
                                $('#HEndDate').prop('disabled', false);  //ç»ææ¶é´å¯èªé
@@ -1147,8 +1147,8 @@
                            //éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
                            document.getElementById("HFilterScheme_Now").style.display = "none";//å¨HTMLææ¡£ä¸æ¾å°IDä¸ºHFilterScheme_Nowçåç´ ï¼å¹¶è®¾ç½®å¶CSSçdisplayå±æ§ä¸ºnone
                            //æ§è¡æ¥è¯¢æ¹æ³
                            //get_FastQuery()
                            //form.render("select");
                            get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });  //è¦ç¤ºç¤º  æ¥å£è¯·æ±å¤±è´¥  è¦ç¤ºæ å¿ä¸º5ç

 WebTM/views/²É¹º¹ÜÀí/Î¯Íâ¶©µ¥/WW_EntrustOrderBillList.html

@@ -468,7 +468,7 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option)
                // get_FastQuery(table, option)
                //å è½½ä¸å¡å
                get_HEmpName();
                //éèå¾éåæ®µ
@@ -1680,7 +1680,7 @@


                                //æ§è¡æ¥è¯¢æ¹æ³
                                get_FastQuery();
                                // get_FastQuery();
                            } else {
                                $('#HBeginDate').prop('disabled', false);
                                $('#HEndDate').prop('disabled', false);

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏÍ¨Öªµ¥/Cg_POInStockBillList.html

@@ -415,9 +415,9 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //åå§åé¡µå¤§å°
                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
                // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(1)
                // get_FastQuery(1)

                

@@ -2024,7 +2024,7 @@


                                //æ§è¡æ¥è¯¢æ¹æ³
                                get_FastQuery();
                                //get_FastQuery();
                            } else {
                                $('#HDate').prop('disabled', false);
                                $('#HDate1').prop('disabled', false);
@@ -2038,8 +2038,8 @@
                            //éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////æ§è¡æ¥è¯¢æ¹æ³
                            //get_FastQuery()
                            //form.render("select");
                            get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏÍ¨Öªµ¥/Cg_POInStockBillQuery.html

@@ -460,7 +460,7 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option,1)
                // get_FastQuery(table, option,1)

                //æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
                get_DefaultModule();
@@ -1630,7 +1630,7 @@
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            ////æ§è¡æ¥è¯¢æ¹æ³
                            get_FastQuery()
                            //form.render("select");
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏÍ¨Öªµ¥/Cg_POInStockBackBillList.html

@@ -370,9 +370,9 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(1)
                // get_FastQuery(1)
                //éèå¾éåæ®µ
                DisPlay_HideColumn();
                // DisPlay_HideColumn();
                //ä»»æåæ®µè¿æ»¤ä¸ææ¡åå§å
                ColFilter();
                //æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
@@ -1355,7 +1355,7 @@


                                //æ§è¡æ¥è¯¢æ¹æ³
                                get_FastQuery();
                                // get_FastQuery();
                            } else {
                                $('#HBeginDate').prop('disabled', false);
                                $('#HEndDate').prop('disabled', false);
@@ -1369,8 +1369,8 @@
                            //éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //æ§è¡æ¥è¯¢æ¹æ³
                            //get_FastQuery()
                            //form.render("select");
                            get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillQuery.html

@@ -461,7 +461,7 @@
                //åå§åè¡¨æ ¼
                set_InitGrid();
                ////ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option,1)
                // get_FastQuery(table, option,1)

                //æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
                get_DefaultModule();

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁÏ³ö¿â/Kf_MateOutBillEdit_MaoJian.html

@@ -136,21 +136,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" readonly
                                                    class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
                                                    value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn"
                                                    lay-filter="WareHouse" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
                                                        style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å®¢æ·</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -307,21 +292,6 @@
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <!-- <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" readonly
                                                    class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
                                                    value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn"
                                                    lay-filter="WareHouse" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
                                                        style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div> -->
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æºåç±»å</label>
                                            <div class="layui-input-inline">
@@ -932,7 +902,7 @@
                        } else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
                        } else if (HMaterRuleExternType1 == "è½¯å") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
                        }
                        //if (HMaterRuleExternType == 'æ¯å°') {
                        //    option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
@@ -960,7 +930,7 @@
                        } else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
                            HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
                        } else if (HMaterRuleExternType1 == "è½¯å") {
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
                            option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
                        }

                    }
@@ -1200,7 +1170,7 @@
                        } else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
                            HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
                        } else if (HMaterRuleExternType1 == "è½¯å") {
                            HQty = dealDoubleToFixed(HRate * HLong * 0.001);
                            HQty = dealDoubleToFixed(HRate * HLong);
                        }
                        //if (HMaterRuleExternType == 'æ¯å°') {
                        //    HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
@@ -1406,8 +1376,8 @@
                    , { field: 'HPrice', title: 'åä»·', width: 100, hide: true }
                    , { field: 'HMoney', title: 'éé¢', width: 100, hide: true }
                    , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
                    , { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: true }
                    , { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: true }
                    , { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: false }
                    , { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: false }
                    , { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                ];
@@ -1523,8 +1493,8 @@
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

                                //, "HInnerBillNo": data.åé¨åæ®å·
                                "HWHID": data.HWHIDMain                    //ä»åºID
                                , "HWHName": data.ä»åº                   //ä»åºåç§°
                                //"HWHID": data.HWHIDMain                    //ä»åºID
                                //, "HWHName": data.ä»åº                   //ä»åºåç§°
                                //, "HSecManagerID": data.HSecManagerID    //éªæ¶åID
                                //, "HSecManagerName": data.é¢æå         //éªæ¶ååç§°
                                //, "HKeeperID": data.HKeeperID            //ä¿ç®¡åID
@@ -1534,7 +1504,7 @@
                                //, "HSourceBillType": data.æºåç±»å        //æºåç±»å
                                //, "XDH": ""                               //éåå·

                                ,"HBillNo": data.åæ®å·
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HDeptID": data.HDeptID                 //é¨é¨ID
                                , "HDeptName": data.é¨é¨                  //é¨é¨åç§°
@@ -1808,7 +1778,7 @@
                                        } else if (option.data[rowIndex + i].HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
                                        } else if (option.data[rowIndex + i].HMaterRuleExternType1 == "è½¯å") {
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong * 0.001);
                                            option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong);
                                        }
                                        //if (option.data[rowIndex + i].HMaterRuleExternType == "æ¯å°") {
                                        //    option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁÏ³ö¿â/Kf_MateOutBillEdit_YangMao.html

@@ -140,21 +140,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" readonly
                                                    class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
                                                    value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn"
                                                    lay-filter="WareHouse" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
                                                        style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å®¢æ·</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -309,7 +294,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <!-- <div class="layui-inline">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
@@ -323,7 +308,7 @@
                                                        style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div> -->
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æºåç±»å</label>
                                            <div class="layui-input-inline">
@@ -1455,8 +1440,8 @@
                    , { field: 'HPrice', title: 'åä»·', width: 100, hide: true }
                    , { field: 'HMoney', title: 'éé¢', width: 100, hide: true }
                    , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
                    , { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: true }
                    , { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: true }
                    , { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: false }
                    , { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: false }
                    , { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                ];
@@ -1572,8 +1557,8 @@
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

                                //, "HInnerBillNo": data.åé¨åæ®å·
                                "HWHID": data.HWHIDMain                    //ä»åºID
                                , "HWHName": data.ä»åº                   //ä»åºåç§°
                                //"HWHID": data.HWHIDMain                    //ä»åºID
                                //, "HWHName": data.ä»åº                   //ä»åºåç§°
                                //, "HSecManagerID": data.HSecManagerID    //éªæ¶åID
                                //, "HSecManagerName": data.é¢æå         //éªæ¶ååç§°
                                //, "HKeeperID": data.HKeeperID            //ä¿ç®¡åID
@@ -1583,7 +1568,7 @@
                                //, "HSourceBillType": data.æºåç±»å        //æºåç±»å
                                //, "XDH": ""                               //éåå·

                                , "HBillNo": data.åæ®å·
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HDeptID": data.HDeptID                 //é¨é¨ID
                                , "HDeptName": data.é¨é¨                  //é¨é¨åç§°

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁÏ³ö¿â/Kf_MateOutBillLEdit.html

@@ -136,21 +136,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" readonly
                                                    class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
                                                    value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn"
                                                    lay-filter="WareHouse" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"
                                                        style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">å®¢æ·<label style="color:red"> *
                                                </label></label>
                                            <div class="layui-input-inline">
@@ -301,7 +286,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-form-item">
                                        <!-- <div class="layui-inline">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
@@ -310,7 +295,7 @@
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div> -->
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æºåç±»å</label>
                                            <div class="layui-input-inline">
@@ -1463,8 +1448,8 @@
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

                                //, "HInnerBillNo": data.åé¨åæ®å·
                                "HWHID": data.HWHIDMain                    //ä»åºID
                                , "HWHName": data.ä»åº                   //ä»åºåç§°
                                //"HWHID": data.HWHIDMain                    //ä»åºID
                                //, "HWHName": data.ä»åº                   //ä»åºåç§°
                                //, "HSecManagerID": data.HSecManagerID    //éªæ¶åID
                                //, "HSecManagerName": data.é¢æå         //éªæ¶ååç§°
                                //, "HKeeperID": data.HKeeperID            //ä¿ç®¡åID
@@ -1474,7 +1459,7 @@
                                //, "HSourceBillType": data.æºåç±»å        //æºåç±»å
                                //, "XDH": ""                               //éåå·

                                , "HBillNo": data.åæ®å·
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HDeptID": data.HDeptID                 //é¨é¨ID
                                , "HDeptName": data.é¨é¨                  //é¨é¨åç§°

			@@ -2,7 +2,7 @@
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -351,7 +351,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid(); //æ§è¡è¡¨æ ¼åå§åæ¹æ³
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(); //æ§è¡æ¥è¯¢æ¹æ³
			// get_FastQuery(); //æ§è¡æ¥è¯¢æ¹æ³

			//éèå¾éåæ®µ
			DisPlay_HideColumn();//æ§è¡éèæ¹æ³
			@@ -1133,7 +1133,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			// get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false); //å¼å§æ¶é´å¯èªé
			$('#HEndDate').prop('disabled', false); //ç»ææ¶é´å¯èªé
			@@ -1147,8 +1147,8 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";//å¨HTMLææ¡£ä¸æ¾å°IDä¸ºHFilterScheme_Nowçåç´ ï¼å¹¶è®¾ç½®å¶CSSçdisplayå±æ§ä¸ºnone
			//æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			get_FastQuery()
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); //è¦ç¤ºç¤º æ¥å£è¯·æ±å¤±è´¥ è¦ç¤ºæ å¿ä¸º5ç

			@@ -468,7 +468,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			// get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			//éèå¾éåæ®µ
			@@ -1680,7 +1680,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			// get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);

			@@ -415,9 +415,9 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(1)
			// get_FastQuery(1)



			@@ -2024,7 +2024,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			//get_FastQuery();
			} else {
			$('#HDate').prop('disabled', false);
			$('#HDate1').prop('disabled', false);
			@@ -2038,8 +2038,8 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			////æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			get_FastQuery()
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

			@@ -460,7 +460,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option,1)
			// get_FastQuery(table, option,1)

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			@@ -1630,7 +1630,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			////æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			//form.render("select");
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

			@@ -370,9 +370,9 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(1)
			// get_FastQuery(1)
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			// DisPlay_HideColumn();
			//ä»»æåæ®µè¿æ»¤ä¸ææ¡åå§å
			ColFilter();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			@@ -1355,7 +1355,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			// get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			@@ -1369,8 +1369,8 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			get_FastQuery()
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

			@@ -461,7 +461,7 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			////ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option,1)
			// get_FastQuery(table, option,1)

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			@@ -136,21 +136,6 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" readonly
			class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input"
			value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCusName" lay-verify="HCusName"
			@@ -307,21 +292,6 @@
			</div>
			</div>
			<div class="layui-form-item">
			<!-- <div class="layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" readonly
			class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input"
			value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div> -->
			<div class="layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -932,7 +902,7 @@
			} else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			} else if (HMaterRuleExternType1 == "è½¯å") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
			}
			//if (HMaterRuleExternType == 'æ¯å°') {
			// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			@@ -960,7 +930,7 @@
			} else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			} else if (HMaterRuleExternType1 == "è½¯å") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong);
			}

			}
			@@ -1200,7 +1170,7 @@
			} else if (HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			} else if (HMaterRuleExternType1 == "è½¯å") {
			HQty = dealDoubleToFixed(HRate * HLong * 0.001);
			HQty = dealDoubleToFixed(HRate * HLong);
			}
			//if (HMaterRuleExternType == 'æ¯å°') {
			// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			@@ -1406,8 +1376,8 @@
			, { field: 'HPrice', title: 'åä»·', width: 100, hide: true }
			, { field: 'HMoney', title: 'éé¢', width: 100, hide: true }
			, { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: true }
			, { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: true }
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: false }
			, { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: false }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			@@ -1523,8 +1493,8 @@
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

			//, "HInnerBillNo": data.åé¨åæ®å·
			"HWHID": data.HWHIDMain //ä»åºID
			, "HWHName": data.ä»åº //ä»åºåç§°
			//"HWHID": data.HWHIDMain //ä»åºID
			//, "HWHName": data.ä»åº //ä»åºåç§°
			//, "HSecManagerID": data.HSecManagerID //éªæ¶åID
			//, "HSecManagerName": data.é¢æå //éªæ¶ååç§°
			//, "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			@@ -1534,7 +1504,7 @@
			//, "HSourceBillType": data.æºåç±»å //æºåç±»å
			//, "XDH": "" //éåå·

			,"HBillNo": data.åæ®å·
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨ //é¨é¨åç§°
			@@ -1808,7 +1778,7 @@
			} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "å©åï¼ææµéç®ï¼") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
			} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "è½¯å") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong * 0.001);
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong);
			}
			//if (option.data[rowIndex + i].HMaterRuleExternType == "æ¯å°") {
			// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);

			@@ -140,21 +140,6 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" readonly
			class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input"
			value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCusName" lay-verify="HCusName"
			@@ -309,7 +294,7 @@
			</div>
			</div>
			<div class="layui-form-item">
			<!-- <div class="layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			@@ -323,7 +308,7 @@
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div> -->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -1455,8 +1440,8 @@
			, { field: 'HPrice', title: 'åä»·', width: 100, hide: true }
			, { field: 'HMoney', title: 'éé¢', width: 100, hide: true }
			, { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: true }
			, { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: true }
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120, hide: false }
			, { field: 'HWHName', title: 'åæä»åºåç§°', width: 120, hide: false }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			@@ -1572,8 +1557,8 @@
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

			//, "HInnerBillNo": data.åé¨åæ®å·
			"HWHID": data.HWHIDMain //ä»åºID
			, "HWHName": data.ä»åº //ä»åºåç§°
			//"HWHID": data.HWHIDMain //ä»åºID
			//, "HWHName": data.ä»åº //ä»åºåç§°
			//, "HSecManagerID": data.HSecManagerID //éªæ¶åID
			//, "HSecManagerName": data.é¢æå //éªæ¶ååç§°
			//, "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			@@ -1583,7 +1568,7 @@
			//, "HSourceBillType": data.æºåç±»å //æºåç±»å
			//, "XDH": "" //éåå·

			, "HBillNo": data.åæ®å·
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨ //é¨é¨åç§°