zgq
2021-07-14 fac7460490a706d9c0c7505246aee09ed6f0d585
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
3个文件已修改
20 ■■■■■ 已修改文件
WebAPI/Controllers/POStockInBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/ProductInController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebServer.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs
@@ -213,7 +213,7 @@
                }
                else if (HSourceBillType == "1103")
                {
                    ds = webserver.GetCg_PoInStockBillList(sWhere + "  and isnull(HBillSubType,0)=12510 ");
                    ds = webserver.GetCg_PoInStockBillList(sWhere + "");
                }
                else
                {
WebAPI/Controllers/ProductInController.cs
@@ -219,6 +219,10 @@
                {
                    ds = webserver.GetSc_ICMOBillList(sWhere + "  ");
                }
                if (HSourceBillType == "3711")
                {
                    ds = webserver.GetSc_ICMOReportBillList(sWhere + "  ");
                }
                else
                {
                    objJsonResult.code = "0";
WebAPI/WebServer.cs
@@ -4645,7 +4645,19 @@
            //DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
            //return dal.DisSourceBillList(sWhere);
        }
        /// <summary>
        /// 返回生产汇报单列表   源单
        /// </summary>
        /// <param name="sWhere">过滤条件</param>
        /// <returns></returns>
        public DataSet GetSc_ICMOReportBillList(string sWhere)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            return  oWebs.GetSc_ICMOReportBillList (sWhere);
            //DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
            //return dal.DisSourceBillList(sWhere);
        }
        /// <summary>
        /// 生成产品入库单K3