1

duhe

2024-01-04 f887a4ae5354071d115889c77d124552dce4f1ce

1

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -2823,8 +2823,8 @@
                    string HProcID = item["HProcID"].ToString();//工序ID
                    string HUserID = item["用户代码"].ToString();//用户代码
                    string czymc = item["用户名称"].ToString();//用户名称
                    string HNumber = item["工序代码"].ToString();//供应商代码
                    string HName = item["工序名称"].ToString();//供应商名称
                    string HNumber = item["工序代码"].ToString();//工序代码
                    string HName = item["工序名称"].ToString();//工序名称

                    var ds = oCN.RunProcReturn("select * from Gy_UserByProcess where  HProcID='" + HProcID + "'and HUserID='" + HUserID + "'", "Gy_UserByProcess");

@@ -2865,5 +2865,45 @@
            }
        }
        #endregion

        #region  ç”¨æˆ·å…³è”工序列表查询
        [Route("Xt_User/UserProcesslist")]
        [HttpGet]
        public object UserProcesslist(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
               

                string sql1 = "select * from h_v_Gy_UserProcess where 1 = 1";
                string sql = sql1 + sWhere + " order by ç”¨æˆ·ä»£ç  ";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserProcess");

                //添加列名
                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列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

@@ -118,7 +118,7 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,物料代码 HMaterCode,物料名称 HMaterName,规格型号 HMaterSpec,
                                            HUnitID, è®¡é‡å•ä½ä»£ç  HUnitCode, è®¡é‡å•ä½ HUnitName,HSourceID,生产资源代码 HSourceCode,生产资源 HSourceName,
                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark
                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo 
                                            FROM h_v_IF_ICMOReportBillList_Edit"), "h_v_IF_ICMOReportBillList_Edit");

                    objJsonResult.code = "0";
@@ -132,7 +132,7 @@
                    //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
                                            HWorkerid,操作员代码 HWorkerCode,操作员 HWorkerName,生产数量 HQty,表体备注 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo 
                                            FROM h_v_IF_ICMOReportBillList_Edit where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
@@ -298,8 +298,8 @@
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    //oItemSub.HRemark = "";         //备注
                    oItemSub.HSourceInterID = 0;     // æºå•ä¸»å†…码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    //oItemSub.HSourceInterID = 0;     // æºå•ä¸»å†…码
                    //oItemSub.HSourceEntryID = 0;   //源单子内码
                    //oItemSub.HSourceBillNo = "";  //源单单号
                    //oItemSub.HSourceBillType = ""; //源单类型
                    //oItemSub.HRelationQty = 0;     //关联数量

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

@@ -204,7 +204,7 @@
                            return objJsonResult;
                        }

                        ds = oCN.RunProcReturn($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
                        ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain a inner join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID where HMainSourceInterID={HMainSourceInterID}" +
                            $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
@@ -334,9 +334,7 @@
                        return objJsonResult;
                    }
                }

             

                //同步日计划工单
                oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");


 WebAPI/Controllers/WebAPIController.cs

@@ -4778,6 +4778,18 @@
        #endregion

        /// <summary>
        /// ç”¨å…³è”工序获取信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_UserProcessDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_UserProcessDetail(string HID)
        {
            var model = LuBaoSevice.GetGy_UserProcessBillDetail(HID);
            return model;
        }

        /// <summary>
        /// æŠ¥åºŸåŽŸå› 
        /// </summary>
        /// <returns></returns>

 WebAPI/DLL/ClsSc_ICMOReportBill.cs

@@ -83,7 +83,7 @@
                      "HCloseMan,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                      ",HICMOInterID,HICMOBillNo,HBarCode" +
                      ",HICMOInterID,HICMOBillNo,HBarCode,HICMOEntryID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber +"'"+
                      "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
@@ -91,7 +91,7 @@
                      ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'" +
                      "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'," + oSub.HICMOEntryID +
                      ") ");
                }
                if (omodel.HCheckType == "合格")
@@ -528,6 +528,7 @@
            }
            catch (Exception e)
            {
                oCn.RollBack();
                sReturn = e.Message;
                throw (e);
            }
@@ -563,15 +564,18 @@
            {
                oCn.BeginTran();
                //查询生产汇报单表数量
                DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HSourceInterID,b.HSourceEntryID  from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
                DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HICMOInterID,b.HICMOEntryID  from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
                string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
                string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
                string HSourceEntryID = ds.Tables[0].Rows[0]["HSourceEntryID"].ToString();
                string HICMOInterID = ds.Tables[0].Rows[0]["HICMOInterID"].ToString();
                string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
                //
                //更新产量汇报临时表是否报检申请状态
                string sql1 = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HRelationInterID='0' where HICMOReportBillNo='"+ HBillNo + "' and HICMOInterID='"+ HSourceInterID + "' and HICMOEntryID='"+ HSourceEntryID + "'");
                string sql1 = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HRelationInterID='0',HRelationEntryID='0',HICMOReportBillNo=null where HICMOReportBillNo='" + HBillNo + "' and HICMOInterID='"+ HICMOInterID + "' and HICMOEntryID='"+ HICMOEntryID + "'");
                oCn.RunProc(sql1);

                //更新质量汇报临时表是否报检申请状态
                string sql2 = string.Format(@"update Sc_ICMOBillQualityStatus_Tmp set HRelationInterID='0',HRelationBillNo='' where HRelationBillNo='" + HBillNo + "' and HRelationInterID='" + lngBillKey + "'");
                oCn.RunProc(sql2);
              
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除明细表

 WebAPI/Service/LuBaoSevice.cs

@@ -299,15 +299,34 @@
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            var dataSet = GetGy_UserProcessDb(HID);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在用户关联工序数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        public static DataSet GetGy_UserProcessDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_UserProcess  where HItemID= " + HID + " ", "h_v_Gy_UserProcess");
            return dataSet;
        }

        /// <summary>
        /// ç”¨æˆ·å…³è”工序根据id获取信息
        /// </summary>
        public static ApiResult<DataSet> GetGy_UserProcessBillDetail(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            var dataSet = GetGy_InspectBasisDb(HID);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在检验依据数据" };
                return new ApiResult<DataSet> { code = -1, msg = "不存在用户关联工序数据" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        public static DataSet GetGy_InspectBasisDb(string HID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_InspectBasis  where HItemID= " + HID + " ", "h_v_Gy_InspectBasis");
            var dataSet = oCN.RunProcReturn("select  * from h_v_Gy_UserProcess  where ç”¨æˆ·ä»£ç = '" + HID + "' ", "h_v_Gy_UserProcess");
            return dataSet;
        }