智云SRM-WEBAPI(目前客户通用API)
生成条码时新增写入字段,列表改为动态列;退货单列表;同步送货单时新增字段,夏宝得先在金蝶删除收料通知单才能在供应商平台删除送货单
5个文件已修改
216 ■■■■ 已修改文件
WebAPI/Controllers/BarCodeController.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POInStockBackController.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POInStockController.cs 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BarCodeController.cs
@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
@@ -630,6 +631,7 @@
                            bar.HMTONO = oItemSub.HMTONO;
                            bar.HSupBatchNo = oItemSub.HSupBatchNo;
                            bar.HSupMaterNumber = oItemSub.HSupMaterNumber;
                            bar.HISKFPERIOD = oItemSub.HISKFPERIOD;
                            ls2.Add(bar);
                        }
                    }
@@ -712,6 +714,7 @@
                            bar2.HMTONO = oItemSub2.HMTONO;
                            bar2.HSupBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HSupBatchNo);
                            bar2.HSupMaterNumber = DBUtility.ClsPub.isStrNull(oItemSub2.HSupMaterNumber);
                            bar2.HISKFPERIOD = DBUtility.ClsPub.isInt(oItemSub2.HISKFPERIOD);
                            ls3.Add(bar2);
                            //LogService.Write("测试加+++" + oItemSub2.HSupID);
                        }
@@ -738,6 +741,7 @@
                string HMTONO = "";
                string HSupBatchNo = "";
                string HSupMaterNumber = "";
                Int64 HISKFPERIOD = 0;
                oCn.BeginTran();
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
                {
@@ -768,6 +772,8 @@
                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);
                        HSupBatchNo = ClsPub.isStrNull(oItemSub.HSupBatchNo);
                        HSupMaterNumber = ClsPub.isStrNull(oItemSub.HSupMaterNumber);
                        HISKFPERIOD = DBUtility.ClsPub.isInt(oItemSub.HISKFPERIOD);
                        if (FCusName.Contains("夏宝"))
                        {
                            HBarCode = $"{oItemSub.HMaterID}";
@@ -775,11 +781,11 @@
                        }
                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HSupBatchNo,HSupMaterNumber " +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD " +
                                    ") values ("
                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','" + HSupBatchNo+ "','" + HSupMaterNumber + "'" +
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','" + HSupBatchNo+ "','" + HSupMaterNumber + "','" + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD +
                                    ")";
                        oCn.RunProc(sql);
                        //LogService.Write(sql);
@@ -811,6 +817,7 @@
                        HWei = ClsPub.isStrNull(oItemSub.HEndQty);
                        HSupBatchNo = ClsPub.isStrNull(oItemSub.HSupBatchNo);
                        HSupMaterNumber = ClsPub.isStrNull(oItemSub.HSupMaterNumber);
                        HISKFPERIOD = ClsPub.isInt(oItemSub.HISKFPERIOD);
                        if (FCusName.Contains("夏宝"))
                        {
                            HBarCode = $"{oItemSub.HMaterID}";
@@ -818,12 +825,12 @@
                        }
                        string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO ,HSupBatchNo,HSupMaterNumber" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO ,HSupBatchNo,HSupMaterNumber,HProduceDate,HExpiryDate,HISKFPERIOD" +
                                    ") values ("
                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO +  "','" +
                                    HSupBatchNo + "','" + HSupMaterNumber + "'" + ")";
                                    HSupBatchNo + "','" + HSupMaterNumber + "','" + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                        oCn.RunProc(sql);
                        //LogService.Write(sql);
                    }
@@ -1362,6 +1369,8 @@
        public object GetBarCodeShowList([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //添加列名
            List<object> columnNameList = new List<object>();
            try
            {
                string VsWhere = "";
@@ -1392,10 +1401,18 @@
                }
                else
                {
                    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列对象的列名
                    }
                    objjson.code = "0";
                    objjson.count = 10000;
                    objjson.Message = "获取成功";
                    objjson.data = ds.Tables[0];
                    objjson.list = columnNameList;
                    return objjson;
                }
            }
@@ -1704,6 +1721,7 @@
                            bar.HSupID = oItemSub.HSupID;
                            bar.HEndQty = WeiShu;
                            bar.HMTONO = oItemSub.HMTONO;
                            bar.HISKFPERIOD = oItemSub.HISKFPERIOD;
                            ls2.Add(bar);
                        }
                    }
@@ -1785,6 +1803,7 @@
                            bar2.HSupID = oItemSub2.HSupID;
                            bar2.HEndQty = WeiShu1;
                            bar2.HMTONO = oItemSub2.HMTONO;
                            bar2.HISKFPERIOD = oItemSub2.HISKFPERIOD;
                            ls3.Add(bar2);
                        }
                    }
@@ -1807,6 +1826,7 @@
                string HKFDQDate = "";
                string HWei = "";
                string HMTONO = "";
                Int64 HISKFPERIOD = 0;
                oCn.BeginTran();
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
                {
@@ -1838,6 +1858,7 @@
                            HSourceEntryID = ClsPub.isLong(oItemSub.HSourceEntryID);
                            HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
                            HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
                            HISKFPERIOD = ClsPub.isInt(oItemSub.HISKFPERIOD);
                            HWei = ClsPub.isStrNull(oItemSub.HEndQty);
                            if (FCusName.Contains("夏宝"))
                            {
@@ -1846,11 +1867,12 @@
                            }
                            string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                        ",HBatchNo,HBarcodeQtys,HBarcodeNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                        ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
                                        ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HProduceDate,HExpiryDate,HISKFPERIOD" +
                                        ") values ("
                                        + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                        + "','" + HBatchNo + "','" + SubModel.Count + "','" + count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                        + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
                                        + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','"
                                        + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                            oCn.RunProc(sql);
                            oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
                            count++;
@@ -1883,6 +1905,7 @@
                            HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
                            HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
                            HWei = ClsPub.isStrNull(oItemSub.HEndQty);
                            HISKFPERIOD = ClsPub.isInt(oItemSub.HISKFPERIOD);
                            if (FCusName.Contains("夏宝"))
                            {
                                HBarCode = $"{oItemSub.HMaterID}";
@@ -1890,11 +1913,12 @@
                            }
                            string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                      ",HBatchNo,HBarcodeQtys,HBarcodeNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
                                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HProduceDate,HExpiryDate,HISKFPERIOD" +
                                      ") values ("
                                      + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                      + "','" + HBatchNo + "','" + SubModel.Count + "','" + _count + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                      + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
                                      + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','"
                                      + HKFDate + "','" + HKFDQDate + "'," + HISKFPERIOD + ")";
                            oCn.RunProc(sql);
                            _count++;
                        }
WebAPI/Controllers/POInStockBackController.cs
@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
@@ -74,5 +75,67 @@
                return objjson;
            }
        }
        /// <summary>
        /// 退货单动态列表
        /// </summary>
        /// <param name="msg"></param>
        /// <param name="NowPage"></param>
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetPOInStockBackBill")]
        [HttpPost]
        //退货单动态列表
        public object GetPOInStockBackBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //string msg = "";
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "转换特殊字符失败";
                    objjson.data = null;
                    return objjson;
                }
                string sql2 = "select * from h_v_SRM_POInStockBackByK3List " + VsWhere;
                ds = oCn.RunProcReturn(sql2, "h_v_SRM_POInStockBackByK3List");
                //添加列名
                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列对象的列名
                }
                objjson.code = "0";
                objjson.count = 10000;
                objjson.Message = "获取成功";
                objjson.data = ds.Tables[0];
                objjson.list = columnNameList;
                return objjson;
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }
    }
}
WebAPI/Controllers/POInStockController.cs
@@ -359,41 +359,41 @@
                int i = 0;
                foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
                {
                    if (FCusName.Contains("凯贝奈特")) //系统参数  客户定制化名称     空白为通用
                    {
                        if (oItemSub.HBatChNo.Length != 8 || Regex.IsMatch(oItemSub.HBatChNo, @"^[0-9]+$") == false)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 格式错误无法保存!正确格式为8位数的纯数字日期";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //获取年月日
                        string year = oItemSub.HBatChNo.Substring(0, 4);
                        string month = oItemSub.HBatChNo.Substring(4, 2);
                        string day = oItemSub.HBatChNo.Substring(6, 2);
                    //if (FCusName.Contains("凯贝奈特")) //系统参数  客户定制化名称     空白为通用
                    //{
                    //    if (oItemSub.HBatChNo.Length != 8 || Regex.IsMatch(oItemSub.HBatChNo, @"^[0-9]+$") == false)
                    //    {
                    //        objJsonResult.code = "0";
                    //        objJsonResult.count = 0;
                    //        objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 格式错误无法保存!正确格式为8位数的纯数字日期";
                    //        objJsonResult.data = 1;
                    //        return objJsonResult;
                    //    }
                        //验证合法性
                        if (Convert.ToInt32(year) < 1900 || Convert.ToInt32(year) > 2100)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 日期不合法无法保存!正确格式为8位数的纯数字日期";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (Convert.ToInt32(month) > 12 || Convert.ToInt32(day) > 31)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 日期不合法无法保存!";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    //    //获取年月日
                    //    string year = oItemSub.HBatChNo.Substring(0, 4);
                    //    string month = oItemSub.HBatChNo.Substring(4, 2);
                    //    string day = oItemSub.HBatChNo.Substring(6, 2);
                }
                    //    //验证合法性
                    //    if (Convert.ToInt32(year) < 1900 || Convert.ToInt32(year) > 2100)
                    //    {
                    //        objJsonResult.code = "0";
                    //        objJsonResult.count = 0;
                    //        objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 日期不合法无法保存!正确格式为8位数的纯数字日期";
                    //        objJsonResult.data = 1;
                    //        return objJsonResult;
                    //    }
                    //    if (Convert.ToInt32(month) > 12 || Convert.ToInt32(day) > 31)
                    //    {
                    //        objJsonResult.code = "0";
                    //        objJsonResult.count = 0;
                    //        objJsonResult.Message = "保存失败!第" + i.ToString() + "行 生产日期D/C 日期不合法无法保存!";
                    //        objJsonResult.data = 1;
                    //        return objJsonResult;
                    //    }
                    //}
                //判断采购订单状态 
                objJsonResult = TestPOOrder(oItemSub.HPOOrderEntryID.ToString());
                    if (objJsonResult.code == "0")
@@ -828,7 +828,7 @@
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID 
,isnull(VW.FNUMBER,'') AS FReceiverNUMBER
,isnull(VW.FNUMBER,'') AS FReceiverNUMBER,isnull(B.HKFDate,'') As FProduceDate,B.HTAXPRICE_T AS F_AAAA_PRICE1
FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -933,6 +933,8 @@
                                    FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                    FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率
                                    FentityModel.Add("FLot", new JObject() { ["Fnumber"] = item["HBatChNo"].ToString() }); // 批号   
                                    FentityModel.Add("FProduceDate", item["FProduceDate"].ToString());//生产日期
                                    FentityModel.Add("F_aaaa_Price1", item["F_aaaa_Price1"].ToString());//含税重量单价/吨
                                    FentityModel.Add("F_bsv_Text1", item["HExpressSupplierSub"].ToString());//物流单位 (瑞琪)
                                    FentityModel.Add("F_bsv_Text2", item["HExpressNumberSub"].ToString());//物流单号 (瑞琪)
@@ -1255,8 +1257,43 @@
            try
            {
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                //先删除 金蝶数据
                objjson = DeleteKingDee(HInterID);
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                //获取客户名称
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                //夏宝需要先在金蝶删除收料通知单后才能在供应商协同平台删除送货单
                if (FCusName == "夏宝电器")
                {
                    string sqlBeforeDel = $"exec h_p_SRM_POInStockBeforeDelCtrl " + HInterID;
                    DataSet ds = oCn.RunProcReturn(sqlBeforeDel, "h_p_SRM_POInStockBeforeDelCtrl");
                    if (ds == null || ds.Tables[0].Rows.Count <= 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除送货单发生异常,没有任何返回记录!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        if (ds.Tables[0].Rows[0]["HBackCount"].ToString() == "1")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = ds.Tables[0].Rows[0]["HRemarkBack"].ToString();
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //先删除 金蝶数据
                    objjson = DeleteKingDee(HInterID);
                }
                //LogService.Write(objjson.ToString());
                if (objjson.code == "0")
                    return objjson;
@@ -1452,7 +1489,7 @@
                //判断未关联数量是否为0
                //安瑞:AIS20220914133941   瑞与琪:AIS20220308151944  本地:AIS20210811135644  夏宝:AIS20211130140219  凯贝:AIS20210820164804
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20220308151944..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,q.FRemainReceiveQty as 剩余收料数量,T1.hrelationqty as 已发货数量,T1.hqty as 订单数量,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20210820164804..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)})", "H_v_SRM_POOrderBillList");
                DataTable dt = ds.Tables[0];
                if (dt.Rows.Count > 0)
                {
@@ -1461,7 +1498,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = $"请检查数据,单据号:{dr[0]["单据号"]},物料编码:{dr[0]["物料编码"]},可以发货数量为0,已全部生成送货单!";
                        objJsonResult.Message = $"请检查数据,单据号:{dr[0]["单据号"]},物料编码:{dr[0]["物料编码"]},可以发货数量为0,已全部生成送货单!,订单数量:{Convert.ToDouble(dr[0]["订单数量"]).ToString("f2")},已发货数量:{Convert.ToDouble(dr[0]["已发货数量"]).ToString("f2")},剩余收料数量:{Convert.ToDouble(dr[0]["剩余收料数量"]).ToString("f2")}";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
WebAPI/DLL/DAL.dll
Binary files differ
WebAPI/DLL/Model.dll
Binary files differ