保存送货单方法外取消事务；生成送货单前校验完善实物回滚；验证采购订单方法添加防死锁；采购订单列表分页查询；物料标准包装模块；

yusijie

2025-06-29 cd1c62ccfd8cf9c582686b6aec02d394a9f4528e

 WebAPI/Controllers/POOrderController.cs

@@ -19,7 +19,7 @@
    {
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();
        SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        /// <summary>
        /// 采购单列表
@@ -33,15 +33,15 @@
        //采购订单列表
        public object GetPOOrderBill([FromBody] JObject msg)
        {
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            string HSupIDs = msg["HSupIDs"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //string msg = "";
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
@@ -86,6 +86,67 @@
            }

        }

        #region

        [Route("GetPOOrderBillList_byPage")]
        [HttpPost]
        //采购订单列表
        public object GetPOOrderBillList_byPage([FromBody] JObject msg)
        {
            string HSupIDs = msg["HSupIDs"].ToString(); 
            string sqlWhere = msg["sqlWhere"].ToString();
            string page = msg["page"].ToString();
            string size = msg["size"].ToString();
            string Organization = msg["Organization"].ToString();
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                string sql = " Where hsupid in (" + HSupIDs.Trim() + ")" + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "转换特殊字符失败";
                    objjson.data = null;
                    return objjson;
                }

                sql = "exec h_p_SRM_POOrderBillListByPage " + page + "," + size + ",'" + Organization + "','" + PcWhere + "'";

                ds = oCn.RunProcReturn(sql, "h_p_SRM_POOrderBillListByPage");
                //添加列名
                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 = "1";
                objjson.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                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;
            }

        }
        #endregion

        /// <summary>
        /// 采购订单表头信息
        /// </summary>
@@ -333,7 +394,7 @@
                oCn.RunProc(sql);

                //凯贝奈特
                sql = "update AIS20210820164804..T_PUR_POORDERENTRY set F_aaaa_Date1 = '" + HSupSendGoodsDateRemark + "' where FID = " + HInterID + " and FENTRYID = " + HEntryID;
                sql = "update AIS20210820164804..T_PUR_POORDERENTRY set F_aaaa_gysjqhf = '" + HSupSendGoodsDateRemark + "' where FID = " + HInterID + " and FENTRYID = " + HEntryID;
                oCn.RunProc(sql);

                objJsonResult.code = "1";