1
yangle
2023-04-27 e1cc2eabf9699c8fb601ff42cf8ce34ad536bc76
1
11个文件已修改
599 ■■■■ 已修改文件
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 191 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 182 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -88,7 +88,7 @@
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    //WMS条码 ç³»ç»Ÿå‚æ•°
                    //生产汇报单
                    //==============================生产汇报单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
                    {
                        omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -137,7 +137,13 @@
                    {
                        omodel.Sc_ICMOReportBill_MESFlag = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //收料通知单(送货单、到货确认)
                    //生产汇报单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_DeleterAndMakerMustSame")
                    {
                        omodel.Sc_ICMOReportBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========================================收料通知单(送货单、到货确认)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
                    {
                        omodel.Cg_POInStockBill_BarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -150,7 +156,7 @@
                    {
                        omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购入库单
                    //===================================采购入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
                    {
                        omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -195,8 +201,13 @@
                    {
                        omodel.Kf_POStockInBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购入库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //产品入库单
                    //=======================================产品入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
                    {
                        omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -241,8 +252,12 @@
                    {
                        omodel.Kf_ProductInBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库单
                    //产品入库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=======================================================其他入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
                    {
                        omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -283,7 +298,13 @@
                    {
                        omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库单  æ ¡éªŒ
                    //其他入库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //========================================其他入库单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -297,7 +318,7 @@
                        omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外入库单
                    //==============================================委外入库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
                    {
                        omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -338,8 +359,15 @@
                    {
                        omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外入库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产领料单
                    //=========================================生产领料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
                    {
                        omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -392,7 +420,10 @@
                    {
                        omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产领料单    æ ¡éªŒ
                    //=========================================生产领料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -406,7 +437,7 @@
                        omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售出库单
                    //=======================================销售出库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
                    {
                        omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -463,6 +494,12 @@
                    {
                        omodel.Kf_SellOutBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售出库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售出库单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
                    {
@@ -522,7 +559,14 @@
                    {
                        omodel.Kf_OtherOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他出库单  æ ¡éªŒ
                    //其他出库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //========================================其他出库单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -536,7 +580,7 @@
                        omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外出库单
                    //========================================委外出库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
                    {
                        omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -585,7 +629,14 @@
                    {
                        omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外领料单    æ ¡éªŒ
                    //委外出库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //===========================委外领料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_EntrustOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -599,7 +650,7 @@
                        omodel.Kf_EntrustOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产补料单
                    //=============================生产补料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
                    {
                        omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -636,7 +687,12 @@
                    {
                        omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产补料单    æ ¡éªŒ
                    //生产补料单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==============================生产补料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MateReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -650,7 +706,7 @@
                        omodel.Kf_MateReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外补料单
                    //================================委外补料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
                    {
                        omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -687,7 +743,12 @@
                    {
                        omodel.Kf_EntrustReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外补料单    æ ¡éªŒ
                    //委外补料单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //======================委外补料单    æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_EntrustReplenishOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -701,7 +762,7 @@
                        omodel.Kf_EntrustReplenishOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //直接调拨单
                    //==================直接调拨单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -750,7 +811,12 @@
                    {
                        omodel.Kf_MoveStockBill_Display = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //直接调拨单  æ ¡éªŒ
                    //直接调拨单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========================================直接调拨单  æ ¡éªŒ
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
                    {
                        omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -764,7 +830,7 @@
                        omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //分步式调出单
                    //==============================================分步式调出单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -809,8 +875,12 @@
                    {
                        omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //分步式调入单
                    //分步式调出单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========================================分步式调入单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
                    {
                        omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -859,8 +929,13 @@
                    {
                        omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //分步式调入单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购退料单
                    //=====================================采购退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
                    {
                        omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -897,8 +972,12 @@
                    {
                        omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退库单
                    //采购退料单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========================生产退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
                    {
                        omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -935,8 +1014,12 @@
                    {
                        omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他入库红字
                    //产品退库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==============================其他入库红字
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
                    {
                        omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -973,8 +1056,12 @@
                    {
                        omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外退库单
                    //其他入库红字单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //===================================委外退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
                    {
                        omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1011,8 +1098,12 @@
                    {
                        omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退料单
                    //其他入库红字单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl")
                    {
                        omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //====================================生产退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
                    {
                        omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1053,8 +1144,13 @@
                    {
                        omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //生产退料单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //销售退库单
                    //===========================销售退库单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
                    {
                        omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1095,8 +1191,12 @@
                    {
                        omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //其他出库红字
                    //销售退库单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========================其他出库红字
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
                    {
                        omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1133,8 +1233,12 @@
                    {
                        omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外退料单
                    //其他出库红字单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //======================================委外退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
                    {
                        omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1174,6 +1278,11 @@
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode")
                    {
                        omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //委外退料单暂存删除人必须是制单人
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_DeleterAndMakerMustSame")
                    {
                        omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //WMS   é€šç”¨
@@ -2751,7 +2860,7 @@
                        omodel.WMS_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //桌面条码模块
                    //桌面条码模块  æ¡ç ä¸»æ¡£
                    //有源单生成条码,生成条码数量可否超源单数量控制
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_SourceQtyCtl")
                    {
@@ -2792,7 +2901,11 @@
                    {
                        omodel.BarCode_AutoSellOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //条码主档删除人必须是制单人('Y'为控制)
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_DeleterAndMakerMustSame")
                    {
                        omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //============================================================================MES系统参数
                    //-==================生产订单
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -21,7 +21,8 @@
        public string Sc_ICMOReportBill_SourceWHSPCtl;          //是否取源单中仓库仓位('Y'为是)
        public string Sc_ICMOReportBill_UpdateSourceInterID;    //上传后回填条码档案源单信息
        public string Sc_ICMOReportBill_MESFlag;                //生产汇报单同步MES标记,Y为同步
        public string Sc_ICMOReportBill_FirstCheckOut;          //必须首件检验通过才能保存单据
        public string Sc_ICMOReportBill_FirstCheckOut;              //必须首件检验通过才能保存单据
        public string Sc_ICMOReportBill_DeleterAndMakerMustSame;    //生产汇报单暂存删除人必须是制单人
        //收料通知单(送货单、到货确认)
        public string Cg_POInStockBill_AutoCheck;       //是否自动审核
@@ -40,6 +41,7 @@
        public string Kf_POStockInBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_POStockInBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_POStockInBill_AutoBarCode;     //免扫码模式,条码类型为非唯一条码,上传时自动生成条码扫码记录
        public string Kf_POStockInBill_DeleterAndMakerMustSame;    //采购入库单暂存删除人必须是制单人
        //产品入库
        public string Kf_ProductInBill_AutoCheck;       //是否自动审核
@@ -53,6 +55,7 @@
        public string Kf_ProductInBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_ProductInBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_ProductInBill_Display;         //扫描物料条码后是否自动刷新子表界面('Y'为是)
        public string Kf_ProductInBill_DeleterAndMakerMustSame;    //产品入库单暂存删除人必须是制单人
        //其他入库
        public string Kf_OtherInBill_AutoCheck;       //是否自动审核
@@ -65,6 +68,7 @@
        public string Kf_OtherInBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_OtherInBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_OtherInBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_OtherInBill_DeleterAndMakerMustSame;    //其他入库单暂存删除人必须是制单人
        //其他入库  æ ¡éªŒ
        public string Kf_OtherInBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_OtherInBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -81,6 +85,7 @@
        public string Kf_EntrustInBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_EntrustInBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_EntrustInBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_EntrustInBill_DeleterAndMakerMustSame;    //委外入库单暂存删除人必须是制单人
        //生产领料
        public string Kf_MateOutBill_AutoCheck;         //是否自动审核
@@ -96,6 +101,7 @@
        public string Kf_MateOutBill_FIFOCtl;           //先进先出控制
        public string Kf_MateOutBill_SimpleMode;        //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制)
        public string Kf_MateOutBill_AutoBarCode;       //免扫码模式,条码类型为非唯一条码,上传时自动生成条码扫码记录
        public string Kf_MateOutBill_DeleterAndMakerMustSame;    //生产领料单暂存删除人必须是制单人
        //生产领料    æ ¡éªŒ
        public string Kf_MateOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_MateOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -116,6 +122,7 @@
        public string Kf_SellOutBill_AutoSavePOStockInBill; //同步生成采购入库单
        public string Kf_SellOutBill_NoRefresh;             //PDA不自动刷新
        public string Kf_SellOutBill_Display;               //扫描物料条码后是否自动刷新子表界面('Y'为是)
        public string Kf_SellOutBill_DeleterAndMakerMustSame;    //销售出库单暂存删除人必须是制单人
        //销售出库  æ ¡éªŒ
        public string Kf_SellOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_SellOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -133,6 +140,7 @@
        public string Kf_OtherOutBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_OtherOutBill_FIFOList;        //先进先出下架清单
        public string Kf_OtherOutBill_FIFOCtl;         //先进先出控制
        public string Kf_OtherOutBill_DeleterAndMakerMustSame;    //其他出库单暂存删除人必须是制单人
        //其他出库  æ ¡éªŒ
        public string Kf_OtherOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_OtherOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -151,6 +159,7 @@
        public string Kf_EntrustOutBill_FIFOList;        //先进先出下架清单
        public string Kf_EntrustOutBill_FIFOCtl;         //先进先出控制
        public string Kf_EntrustOutBill_SimpleMode;      //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制)
        public string Kf_EntrustOutBill_DeleterAndMakerMustSame;    //委外出库单暂存删除人必须是制单人
        //委外领料    æ ¡éªŒ
        public string Kf_EntrustOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_EntrustOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -166,6 +175,7 @@
        public string Kf_MateReplenishOutBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_MateReplenishOutBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_MateReplenishOutBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_MateReplenishOutBill_DeleterAndMakerMustSame;    //生产补料单暂存删除人必须是制单人
        //生产补料  æ ¡éªŒ
        public string Kf_MateReplenishOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_MateReplenishOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -181,6 +191,7 @@
        public string Kf_EntrustReplenishOutBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_EntrustReplenishOutBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_EntrustReplenishOutBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame;    //委外补料单暂存删除人必须是制单人
        //委外补料    æ ¡éªŒ
        public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl;   //校验数量控制
        public string Kf_EntrustReplenishOutBillCheck_WHSPCtl;      //校验-是否校对仓库仓位
@@ -199,6 +210,7 @@
        public string Kf_MoveStockBill_FIFOList;        //先进先出下架清单
        public string Kf_MoveStockBill_FIFOCtl;         //先进先出控制
        public string Kf_MoveStockBill_Display;         //扫描物料条码后是否自动刷新子表界面('Y'为是)
        public string Kf_MoveStockBill_DeleterAndMakerMustSame;    //直接调拨单暂存删除人必须是制单人
        //直接调拨  æ ¡éªŒ
        public string Kf_MoveStockBillCheck_MustQtyCtl;     //校验数量控制
        public string Kf_MoveStockBillCheck_WHSPCtl;        //校验-是否校对仓库仓位
@@ -216,6 +228,7 @@
        public string Kf_MoveStockStepOutBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_MoveStockStepOutBill_FIFOList;        //先进先出下架清单
        public string Kf_MoveStockStepOutBill_FIFOCtl;         //先进先出控制
        public string Kf_MoveStockStepOutBill_DeleterAndMakerMustSame;    //分步式调出单暂存删除人必须是制单人
        //分步式调入单
        public string Kf_MoveStockStepInBill_AutoCheck;       //是否自动审核
@@ -230,6 +243,7 @@
        public string Kf_MoveStockStepInBill_FIFOList;        //先进先出下架清单
        public string Kf_MoveStockStepInBill_FIFOCtl;         //先进先出控制
        public string Kf_MoveStockStepInBill_SourceBarCodeCtl;   //是否进行源单对应条码核对('Y'为核对)
        public string Kf_MoveStockStepInBill_DeleterAndMakerMustSame;    //分步式调入单暂存删除人必须是制单人
        //采购退料
        public string Kf_POStockInBackBill_AutoCheck;       //是否自动审核
@@ -241,6 +255,7 @@
        public string Kf_POStockInBackBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_POStockInBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_POStockInBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_POStockInBackBill_DeleterAndMakerMustSame;    //采购退料单暂存删除人必须是制单人
        //产品退库
        public string Kf_ProductInBackBill_AutoCheck;       //是否自动审核
@@ -252,6 +267,7 @@
        public string Kf_ProductInBackBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_ProductInBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_ProductInBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_ProductInBackBill_DeleterAndMakerMustSame;    //产品退库单暂存删除人必须是制单人
        //其他入库红字
        public string Kf_OtherInBackBill_AutoCheck;       //是否自动审核
@@ -263,6 +279,7 @@
        public string Kf_OtherInBackBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_OtherInBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_OtherInBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_OtherInBackBill_DeleterAndMakerMustSame;    //其他入库红字单暂存删除人必须是制单人
        //委外退库
        public string Kf_EntrustInBackBill_AutoCheck;       //是否自动审核
@@ -274,6 +291,7 @@
        public string Kf_EntrustInBackBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_EntrustInBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_EntrustInBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_EntrustInBackBill_DeleterAndMakerMustSame;    //委外退库单暂存删除人必须是制单人
        //生产退料
        public string Kf_MateOutBackBill_AutoCheck;       //是否自动审核
@@ -286,6 +304,7 @@
        public string Kf_MateOutBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_MateOutBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_MateOutBackBill_SimpleMode;      //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制)
        public string Kf_MateOutBackBill_DeleterAndMakerMustSame;    //生产退料单暂存删除人必须是制单人
        //销售退库
        public string Kf_SellOutBackBill_AutoCheck;                 //是否自动审核
@@ -298,6 +317,7 @@
        public string Kf_SellOutBackBill_MaterWHSPCtl;              //是否取物料默认仓库仓位('Y'为是)
        public string Kf_SellOutBackBill_SourceWHSPCtl;             //是否取源单中仓库仓位('Y'为是)
        public string Kf_SellOutBackBill_AutoSavePOStockInBackBill; //同步生成采购入库单红字
        public string Kf_SellOutBackBill_DeleterAndMakerMustSame;    //销售退库单暂存删除人必须是制单人
        //其他出库红字
        public string Kf_OtherOutBackBill_AutoCheck;       //是否自动审核
@@ -309,6 +329,7 @@
        public string Kf_OtherOutBackBill_MultilineCtl;    //是否存在多行相同物料时自动拆分换行('Y'为自动拆分)
        public string Kf_OtherOutBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_OtherOutBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_OtherOutBackBill_DeleterAndMakerMustSame;    //其他出库红字单暂存删除人必须是制单人
        //委外退料
        public string Kf_EntrustOutBackBill_AutoCheck;       //是否自动审核
@@ -321,6 +342,7 @@
        public string Kf_EntrustOutBackBill_MaterWHSPCtl;    //是否取物料默认仓库仓位('Y'为是)
        public string Kf_EntrustOutBackBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_EntrustOutBackBill_SimpleMode;      //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制)
        public string Kf_EntrustOutBackBill_DeleterAndMakerMustSame;    //委外退料单暂存删除人必须是制单人
        //生产组托
        public string Sc_PackUnionBill_SourceBillTypeCtl;   //未入库条码进行组托时,进行同源单类型控制(Y为控制)
@@ -344,7 +366,7 @@
        public string WMS_BillDateMode;     //单据日期是否取界面递入日期
        //桌面条码模块
        //桌面条码模块 æ¡ç ä¸»æ¡£
        public string BarCode_SourceQtyCtl;     //有源单生成条码,生成条码数量可否超源单数量控制
        public long BarCode_PrintQty;          //允许条码打印次数(1、2、3.....)
        public string BarCode_PrintQtyCtl;      //条码打印次数控制(是否只允许打印一次控制,Y åªå…è®¸æ‰“印一次)
@@ -353,6 +375,7 @@
        public string BarCode_AutoPOStockInBillWMS;     //选源单采购入库单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_AutoMateOutBackBillWMS;   //选源单生产退料单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_AutoSellOutBackBillWMS;   //选源单销售退货单生成条码时是否自动同步生成条码出入库记录('Y'为自动同步)
        public string BarCode_DeleterAndMakerMustSame;  //条码主档删除人必须是制单人
        //====================================================工序流转WIP
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -663,6 +663,18 @@
                if (Ds.Tables[0].Rows.Count != 0)
                {
                    oCN.BeginTran();
                    ////获取系统参数
                    //string Ret = "";
                    //if (oSystemParameter.ShowBill(ref Ret))
                    //{
                    //    //判断是否只能删除自己生成的条码
                    //    if (oSystemParameter.omodel.BarCode_DeleterAndMakerllustSame != "龙山汽配") //系统参数
                    //    {
                    //    }
                    //}
                    oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")");
                    //写入系统日志
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -176,14 +176,6 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HEmpID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "操作员没有选择!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (HQCCheckID == 0)
                //{
                //    objJsonResult.code = "0";
@@ -197,8 +189,8 @@
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户
                    if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配") //系统参数
                    //判断客户不为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配") //系统参数
                    {
                        if (HSourceID == 0)
                        {
@@ -207,10 +199,27 @@
                            objJsonResult.Message = "生产资源没有选择!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    //判断客户为龙山汽配
                    else if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //判断是否为多工位
                        ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where å·¥åºID = " + HProcID + " and ç‰©æ–™ID = " + HMaterID + " and æµè½¬å¡å· = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
                        if (ds != null && ds.Tables[0].Rows.Count <= 1)
                        {
                            if (HEmpID == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "操作员没有选择!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }
                }
                //if (HCenterID == 0)
                //{
                //    objJsonResult.code = "0";
WebAPI/Controllers/LMESController.cs
@@ -375,11 +375,11 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
                }
                else
                {
                    string sql1 = "select  top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
                    string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by hmainid desc,cast(工序号 as int)";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                }
WebAPI/Controllers/POStockInBillController.cs
@@ -928,7 +928,8 @@
                WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
                string text = "";
                string text1 = "";
                bool flag = HBillType == "1201";
                //gy_billnumber å•据类型表
                bool flag = HBillType == "1201"; //WMS é‡‡è´­å…¥åº“
                if (flag)
                {
                    string[] array = sBarCodeNew.Split(new char[]
@@ -946,11 +947,12 @@
                    string str3 = ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HNumber"]);
                    //用拆分出来的物料代码查询物料表里的新物料编码
                    DataSet Dss7;
                    Dss7 = clsCN.RunProcReturn(" select * from AIS20220914133941..T_BD_MATERIAL where FNumber = '" + str + "'", "T_BD_MATERIAL");
                    if (Dss7 == null || Dss7.Tables[0].Rows.Count == 0)
                    {
                        //新物料表里没有返回数据则查询物料表里的旧物料编码
                        DataSet Dss8;
                        Dss8 = clsCN.RunProcReturn(" select * from AIS20220914133941..T_BD_MATERIAL where FOldNumber = '" + str + "'", "T_BD_MATERIAL");
                        str = DBUtility.ClsPub.isStrNull(Dss8.Tables[0].Rows[0]["FNumber"]);
@@ -968,6 +970,7 @@
                    long num3 = (long)ClsPub.isInt(dataSet2.Tables[0].Rows[0]["HUnitID"]);
                    text = str3 + num2.ToString() + text2  + "#" + num;
                    text1 = str3 + num2.ToString() + text2;
                    //找源单
                    DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + str2 + "' and  FLOT_TEXT = '" + text2 + "' and  FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");
                    //DataSet dataSet3 = clsCN.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FLOT_TEXT= '" + text2 + "' and FPRODUCEDATE = '" + dateTime + "' and  FMATERIALID = " + num2.ToString(), "h_v_RECEIVEQuery");
                    num2 = ClsPub.isLong(dataSet3.Tables[0].Rows[0]["FMATERIALID"]);
@@ -980,6 +983,7 @@
                    {
                        DataSet dataSet5 = clsCN.RunProcReturn(string.Concat(new string[]
                        {
                    //扫码临时记录表
                    " select * from KF_PonderationBillMain_Temp where  HInterID = ",
                    hinterid.ToString(),
                    " and HBillType = '",
@@ -992,6 +996,7 @@
                        if (!flag3)
                        {
                            POStockInBillController postockInBillController = new POStockInBillController();
                            //扫源单方法
                            postockInBillController.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", text5, hinterid, HBillNo);
                            //WEBSController webscontroller4 = new WEBSController();
@@ -1066,7 +1071,7 @@
                        }
                    }
                }
                bool flag5 = HBillType == "1202";
                bool flag5 = HBillType == "1202"; //WMS ç”Ÿäº§å…¥åº“
                if (flag5)
                {
                    string text6 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 4);
@@ -1074,14 +1079,14 @@
                    bool flag6 = text7.Contains("W") || text7.Contains("N");
                    if (flag6)
                    {
                        string text8 = sBarCodeNew.Substring(0, 10);
                        string str4 = sBarCodeNew.Substring(10, 10);
                        string text8 = sBarCodeNew.Substring(0, 10);//商品码
                        string str4 = sBarCodeNew.Substring(10, 10);//物料代码
                        string text9 = "20" + sBarCodeNew.Substring(20, 6);
                        long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));
                        long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));
                        long num10 = (long)ClsPub.isInt(text9.Substring(6, 2));
                        long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));
                        string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);
                        long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));//后三位永远都是数字
                        string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);//失效日期+一位字母+三位数字
                        string text11 = "20" + text10.Substring(0, 6);
                        long num12 = (long)ClsPub.isInt(text11.Substring(0, 4));
                        long num13 = (long)ClsPub.isInt(text11.Substring(4, 2));
@@ -1236,7 +1241,8 @@
                    }
                    else
                    {
                        string str6 = sBarCodeNew.Substring(0, 10);
                        /*前十位物料代码,后六位生效日期,倒数前三位是数字前六位是失效日期  æ‰¹å·æ”¹ä¸ºåŠ¨æ€èŽ·å–*/
                        string str6 = sBarCodeNew.Substring(0, 10);//物料代码
                        string text17 = "20" + sBarCodeNew.Substring(10, 6);
                        long num21 = (long)ClsPub.isInt(text17.Substring(0, 4));
                        long num22 = (long)ClsPub.isInt(text17.Substring(4, 2));
@@ -1255,9 +1261,9 @@
                    "-",
                    num27.ToString()
                        }));
                        string text20 = sBarCodeNew.Remove(0, 16);
                        string text21 = text20.Remove(text20.Length - 9, 9);
                        ClsCN clsCN3 = new ClsCN();
                        string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100230309 2303704250308010
                        string text21 = text20.Remove(text20.Length - 9 , 9); //SAE1300100230309 2303704 250308010
                         ClsCN clsCN3 = new ClsCN();
                        DataSet dataSet13 = clsCN3.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str6 + "' and  huseorgid = " + HOrgID.ToString(), "Gy_Material");
                        long num28 = ClsPub.isLong(dataSet13.Tables[0].Rows[0]["HItemID"]);
                        string text22 = ClsPub.isStrNull(dataSet13.Tables[0].Rows[0]["HName"]);
@@ -1381,7 +1387,7 @@
                        }
                    }
                }
                bool flag13 = HBillType == "1244";
                bool flag13 = HBillType == "1244"; //WMS ç”Ÿäº§é€€æ–™å•
                if (flag13)
                {
                    bool flag14 = sBarCodeNew.Contains("@");
@@ -1672,7 +1678,7 @@
                        }
                    }
                }
                bool flag19 = HBillType == "1207";
                bool flag19 = HBillType == "1207"; //WMS ç›´æŽ¥è°ƒæ‹¨
                if (flag19)
                {
                    bool flag20 = sBarCodeNew.Contains("@");
@@ -1947,7 +1953,7 @@
                        }
                    }
                }
                bool flag25 = HBillType == "1206";
                bool flag25 = HBillType == "1206"; //WMS é”€å”®å‡ºåº“
                if (flag25)
                {
                    bool flag26 = sBarCodeNew.Contains("@");
@@ -2235,8 +2241,8 @@
                            }
                        }
                    }
                }
                bool flag31 = HBillType == "1204";
                }
                bool flag31 = HBillType == "1204"; //WMS ç”Ÿäº§é¢†æ–™
                if (flag31)
                {
                    bool flag32 = sBarCodeNew.Contains("@");
@@ -2526,7 +2532,7 @@
                        }
                    }
                }
                bool flag37 = HBillType == "1254" || HBillType == "1211" || HBillType == "1255";
                bool flag37 = HBillType == "1254" /*生产补料*/ || HBillType == "1211" || HBillType == "1255";
                if (flag37)
                {
                    bool flag38 = sBarCodeNew.Contains("@");
@@ -2815,7 +2821,7 @@
                        }
                    }
                }
                bool flag43 = HBillType == "1205";
                bool flag43 = HBillType == "1205";
                if (flag43)
                {
                    bool flag44 = sBarCodeNew.Contains("@");
WebAPI/Controllers/WebAPIController.cs
@@ -384,6 +384,16 @@
            try
            {
                ds = webserver.GetKf_PonderationBillMain_TempList(HBillType, sWhere);
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
@@ -400,6 +410,7 @@
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
@@ -4001,6 +4012,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂë³öÈë¿â¼Ç¼/Kf_ICStockInOutBillController.cs
@@ -39,6 +39,19 @@
            public string SeOrderBillNo;//(销售订单号)
        }
        //条码明细查询 å­˜å‚¨è¿‡ç¨‹ æ•°æ®ç±»
        public class BarCodeDetail
        {
            public BarCodeDetail()
            {
            }
            public int HInterID;
            public string HBillType;
            public string HBillNo;
        }
        #region å‡ºå…¥åº“记录查询
        [Route("Kf_ICStockInOutBill/StockInOutBillList")]
        [HttpGet]
@@ -93,6 +106,62 @@
            return objJsonResult;
        }
        #endregion
        #region å‡ºå…¥åº“单据条码明细查询
        [Route("Kf_ICStockInOutBill/Kf_BarCodeDetailQuery")]
        [HttpGet]
        public object Kf_BarCodeDetailQuery(string sWhere)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                //var data = JsonConvert.DeserializeObject<BarCodeDetail>(sWhere);
                //sWhere = "12727077,'1207','DB00000475'";
                ds = oCN.RunProcReturn("exec h_p_Kf_BarCodeDetailQuery "+sWhere, "h_p_Kf_BarCodeDetailQuery");
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //if (ds.Tables[0].Rows.Count > 0)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = ds.Tables[0].Rows.Count;
                objJsonResult.Message = "获取资源绑定数据成功!";
                objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式,然后再反序列化回来
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "暂无资源绑定!";
                //    objJsonResult.data = null;
                //    objJsonResult.list = columnNameList;
                //    return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion
        #region æ¡ç å‡ºå…¥åº“缓存
        #region æ¡ç å‡ºå…¥åº“缓存列表
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,13 +9,13 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 08:43:40</publishTime>
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
@@ -28,7 +28,7 @@
      <publishTime>04/12/2023 16:24:50</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/17/2020 21:32:28</publishTime>
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
@@ -41,7 +41,7 @@
      <publishTime>04/12/2023 16:24:47</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
@@ -54,34 +54,34 @@
      <publishTime>04/12/2023 16:24:39</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 05:17:26</publishTime>
      <publishTime>03/22/2022 13:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/18/2022 23:39:42</publishTime>
      <publishTime>03/19/2022 07:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 05:17:20</publishTime>
      <publishTime>03/22/2022 13:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/18/2022 23:39:48</publishTime>
      <publishTime>03/19/2022 07:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/08/2021 17:08:30</publishTime>
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/08/2021 17:08:30</publishTime>
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/09/2023 20:21:24</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -90,19 +90,19 @@
      <publishTime>09/20/2018 19:28:34</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/18/2015 17:02:50</publishTime>
      <publishTime>03/19/2015 01:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 11:48:56</publishTime>
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
@@ -115,34 +115,34 @@
      <publishTime>04/12/2023 16:24:40</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
      <publishTime>08/04/2014 04:33:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
@@ -165,7 +165,7 @@
      <publishTime>04/12/2023 16:24:37</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/30/2012 22:22:50</publishTime>
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>04/12/2023 16:24:38</publishTime>
@@ -179,10 +179,10 @@
      <publishTime>05/09/2021 13:35:37</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 10:01:28</publishTime>
      <publishTime>07/19/2017 18:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -206,19 +206,19 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 10:03:34</publishTime>
      <publishTime>08/19/2014 18:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/17/2019 16:24:34</publishTime>
      <publishTime>04/18/2019 00:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 13:00:36</publishTime>
      <publishTime>11/28/2018 21:00:36</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/18/2018 19:38:10</publishTime>
      <publishTime>09/19/2018 03:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -227,7 +227,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 12:58:44</publishTime>
      <publishTime>11/28/2018 20:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -242,37 +242,37 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 13:01:26</publishTime>
      <publishTime>11/28/2018 21:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 13:01:00</publishTime>
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
      <publishTime>01/28/2015 12:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 15:26:04</publishTime>
      <publishTime>02/11/2014 23:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 04:02:32</publishTime>
      <publishTime>01/28/2015 12:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -281,7 +281,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 11:18:48</publishTime>
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
@@ -297,130 +297,130 @@
      <publishTime>04/12/2023 16:25:14</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
      <publishTime>07/18/2013 01:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 13:26:02</publishTime>
      <publishTime>11/29/2018 21:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 13:26:30</publishTime>
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>08/19/2022 08:17:39</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>11/01/2021 09:26:33</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/09/2023 20:21:24</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>11/29/2022 10:36:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>08/19/2021 09:44:01</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/10/2023 09:23:52</publishTime>
@@ -495,7 +495,7 @@
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web References/WebS2/Reference.map">
      <publishTime>03/06/2023 08:54:11</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/14/2022 11:24:08</publishTime>
WebAPI/Web.config
@@ -28,12 +28,12 @@
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
        <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    ç‘žä¸Žç¥º-->
        <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/>    æ£®æ¥·-->
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>  -->
        <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>
        <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/>     å®‰ç‘žæœåС噍-->
        <!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>     å®‰ç‘žæœåС噍-->
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>    æµ‹è¯•服务器-->
        <add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>    <!--本地-->
        <!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>    --><!--本地-->
        <add key="webpages:Version" value="3.0.0.0" />
        <add key="webpages:Enabled" value="false" />
        <add key="ClientValidationEnabled" value="true" />
@@ -100,17 +100,20 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://192.168.63.3/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
     bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
     name="WebService1Soap" />
            <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
              bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
              name="WebService1Soap" />
        </client>
    </system.serviceModel>
 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://192.168.63.3/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>
    <applicationSettings>
        <WebAPI.Properties.Settings>
            <setting name="WebAPI_WebS2_WebService1" serializeAs="String">
                <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
            </setting>
            <setting name="WebAPI_WebS_WebService1" serializeAs="String">
                <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
            </setting>
        </WebAPI.Properties.Settings>
    </applicationSettings>
</configuration>
WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />