yangle
2023-08-15 d3dbf477999c1c6b4e295ea6c2d54b1350c05e5d
修改为动态列
产线组装追溯单单据条码回车查询
2个文件已修改
126 ■■■■ 已修改文件
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_AssemblyBillController.cs 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -783,32 +783,26 @@
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_AssemblyBillList " + sWhere, "h_v_Sc_AssemblyBillList");
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
WebAPI/Controllers/Sc_AssemblyBillController.cs
@@ -24,6 +24,7 @@
        Int64 sCPMaterID = 0;
        string sCPMaterName = "";
        private json objjson = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        //扫描成品条码
        [Route("Assembly/Get_Assembly_CPBarCode_Json")]
@@ -174,10 +175,91 @@
        }
        #region  产线组装追溯单
        [Route("Sc_AssemblyBill/HBardCodeList")]
        [HttpGet]
        public object HBardCodeList(string HBarCode, string user,string HICMOBillNo)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_AssemblyBill_Edit", 1, false, user))
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "无保存权限!";
                    objjson.data = null;
                    return objjson;
                }
                if (HICMOBillNo == "" || HICMOBillNo == null)
                {
                    ds = oCN.RunProcReturn(@"select  b.FMUSTQTY,a.FMOBILLNO,FERPCLSID,t5.FNAME HMaterName_z,t5.FSPECIFICATION HMaterModel_z ,m.HItemID,b.FMATERIALID,m.HName HMaterName,m.HNumber HMaterNumber,m.HModel HMaterModel,m1.HItemID HMaterID
from AIS20210811135644..T_PRD_PPBOM a
join AIS20210811135644..T_PRD_PPBOMENTRY b on a.FID = b.FID
join AIS20210811135644..T_BD_MATERIAL t3 on a.FMATERIALID = t3.FMATERIALID
join AIS20210811135644..T_BD_MATERIAL t31 on b.FMATERIALID = t31.FMATERIALID
join AIS20210811135644..T_BD_MATERIAL_L t5 on b.FMATERIALID = t5.FMATERIALID and FLOCALEID=2052
join AIS20210811135644..t_BD_MaterialBase t4 on t5.FMATERIALID = t4.FMATERIALID
join Gy_BarCodeBill bard on a.FMOBILLNO=bard.HSourceBillNo
join Gy_Material m on bard.HMaterID=m.HItemID and t3.FNUMBER=m.HNumber
join Gy_Material m1 on t31.FNUMBER=m1.HNumber and t31.FUSEORGID=m1.HUSEORGID
where bard.HBarCode='" + HBarCode + "'  AND t4.FERPCLSID in ('1', '3')", "Gy_BarCodeBill");
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objjson.code = "0";
                        objjson.count = 0;
                        objjson.Message = "无源单!";
                        objjson.data = null;
                        return objjson;
                    }
                    else
                    {
                        objjson.code = "1";
                        objjson.count = 1;
                        objjson.Message = "";
                        objjson.data = ds.Tables[0];
                    }
                }
                else
                {
                    ds = oCN.RunProcReturn(@"select  a.FMOBILLNO,FERPCLSID ,t4.FMATERIALID, a.FMATERIALID from AIS20210811135644..T_PRD_PPBOM a
                    join AIS20210811135644..T_PRD_PPBOMENTRY b on a.FID=b.FID
                    JOIN AIS20210811135644..T_BD_MATERIAL T6 ON b.FMATERIALID = T6.FMATERIALID
                    join AIS20210811135644..t_BD_MaterialBase t4 on b.FMATERIALID = t4.FMATERIALID
                    left join Gy_Material m on t6.FNUMBER=m.HNumber and m.HUSEORGID=a.FPRDORGID
                    where a.FMOBILLNO ='" + HICMOBillNo + "' and m.HItemID=(select HMaterID from Gy_BarCodeBill where HBarCode = '" + HBarCode + "' )", "ds2");
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objjson.code = "0";
                        objjson.count = 0;
                        objjson.Message = "配件不属于该生产订单!";
                        objjson.data = null;
                        return objjson;
                    }
                    ds = oCN.RunProcReturn(@"select  HQty,HSourceBillNo,m.HName HMaterName,m.HItemID HMaterID from Gy_BarCodeBill bard
join Gy_Material m on bard.HMaterID=m.HItemID
where  HBarCode='" + HBarCode + "'", "ds3");
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "";
                    objjson.data = ds.Tables[0];
                }
                return objjson;
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "没有返回任何记录!" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        #endregion