智云MES后端API代码
parent: a6f7d019 | 补丁 | 提交 | ignore whitespace
yusijie
2024-01-05 95da5302750b690c5e52953b1d74aff4576cc5be 
生产汇报单子表源单信息存入数据；日计划工单列表查询视图改为调用左连接的；排产保存方法中的生产资源重复校验的查询取消内连接子表
4个文件已修改
28 ■■■■■ 已修改文件
DAL/基础资料/公用基础资料/ClsUser.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsUser.cs


@@ -72,7 +72,7 @@


            DataSet DS;


            try


            {


                DS = oCn.RunProcReturn("select * from Gy_Czygl where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");


                DS = oCn.RunProcReturn("select * from h_v_Gy_Czygl_Login where Czybm='" + MainID + "' and Czmm='" + sPsd + "' ", "Gy_Czygl");


                if (DS.Tables[0].Rows.Count == 0)


                    return null;


                else




 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs


@@ -118,7 +118,9 @@


                {


                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,物料代码 HMaterCode,物料名称 HMaterName,规格型号 HMaterSpec,


                                            HUnitID, è®¡é‡å•ä½ä»£ç  HUnitCode, è®¡é‡å•ä½ HUnitName,HSourceID,生产资源代码 HSourceCode,生产资源 HSourceName,


                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo 


                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark,


                                            HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOInterID as HSourceInterID,HICMOEntryID as HSourceEntryID,


                                            HICMOBillNo as HSourceBillNo,3710 as HSourceBillType


                                            FROM h_v_IF_ICMOReportBillList_Edit"), "h_v_IF_ICMOReportBillList_Edit");




                    objJsonResult.code = "0";


@@ -132,7 +134,10 @@


                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";


                    string sql1 = string.Format(@"SELECT HMaterID,物料代码 HMaterCode,物料名称 HMaterName,规格型号 HMaterSpec,


                                            HUnitID, è®¡é‡å•ä½ä»£ç  HUnitCode, è®¡é‡å•ä½ HUnitName,HSourceID,生产资源代码 HSourceCode,生产资源 HSourceName,


                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo 


                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 


                                            HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo,


                                            HICMOInterID as HSourceInterID,HICMOEntryID as HSourceEntryID,


                                            HICMOBillNo as HSourceBillNo,3710 as HSourceBillType


                                            FROM h_v_IF_ICMOReportBillList_Edit where 1 = 1 ");


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");




 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs


@@ -160,7 +160,7 @@




                LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd"));


                int TrueCount = 0, SumCount = 0;




                LogService.CustomWriteLog("list.Count:"+ list.Count, DateTime.Now.ToString("yyyy-MM-dd"));


                for (int i = 0; i < list.Count; i++)


                {


                    TrueCount = 0;


@@ -204,7 +204,7 @@


                            return objJsonResult;


                        }




                        ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain a inner join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID where HMainSourceInterID={HMainSourceInterID}" +


                        ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +


                            $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");


                        if (ds.Tables[0].Rows.Count > 0)


                        {


@@ -283,6 +283,9 @@




                        if (ds.Tables[0].Rows.Count > 1)


                        {


                            LogService.CustomWriteLog("第" + i + 1 + "行生产资源有重复,请修改", DateTime.Now.ToString("yyyy-MM-dd"));


                            LogService.CustomWriteLog($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +


                              $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", DateTime.Now.ToString("yyyy-MM-dd"));


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = $"第{i + 1}行生产资源有重复,请修改!";


@@ -355,7 +358,7 @@


        }




        public json AddBillSub(string HInterID, string HBillNo, DateTime date, double HQTY, Dictionary<string, string> dic)


        {


        {         


            //获取表格数据


            ds = oCN.RunProcReturn($"select * from  h_v_JIT_Sc_WorkBillSortBillList where å•æ®å·='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");


            int count = 0;


@@ -372,14 +375,14 @@


                    }


                }


            }




           


            if (count != 1)


            {


                //插入子表


                oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +


                    "HMasterDate,HQty,HUseTimes)" +


                            $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +


                            $" '{date}', {HQTY},{(dic["小时产能"] == "0" ? 0 : HQTY / float.Parse(dic["小时产能"].ToString()))})");


                            $" '{date}', {HQTY},{(dic["小时产能"] == "0" ? 0 : HQTY / float.Parse(dic["小时产能"].ToString()))})");               


            }




            objJsonResult.code = "1";




 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Sc_WorkBillSortBillController.cs


@@ -35,7 +35,7 @@


                    return objJsonResult;


                }




                ds = oCN.RunProcReturn("select * from  h_v_JIT_Sc_WorkBillSortBillList where 1=1" + sWhere + " order by å•æ®å· desc ", "h_v_JIT_Sc_WorkBillSortBillList");


                ds = oCN.RunProcReturn("select * from  h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1" + sWhere + " order by å•æ®å· desc ", "h_v_JIT_Sc_WorkBillSortBillList");




                objJsonResult.code = "1";


                objJsonResult.count = 1;


@@ -264,7 +264,7 @@


                    {


                        var NumData_T = NumData[i].Split('_');




                        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + NumData_T[0], "h_v_JIT_Sc_WorkBillSortBillList");


                        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData_T[0], "h_v_JIT_Sc_WorkBillSortBillList");




                        if (ds.Tables[0].Rows.Count > 0)


                        {