产量/质量汇报；设备点检/保养

yusijie

2023-12-01 304854aa46ac306ce2408fe2eda39d313e5034f8

产量/质量汇报；设备点检/保养

 DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBill.cs

@@ -137,6 +137,9 @@
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
                      ") ");
                }
                //点检完成，反写设备点检计划单子表是否点检标记
                oCn.RunProc("exec h_p_Sb_EquipDotCheck_AfterSaveCtrl " + omodel.HEquipDotCheckPlanInterID + "," + omodel.HEquipDotCheckPlanEntryID);

                //
                //foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
                //{

 DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs

@@ -162,6 +162,10 @@
                          "'" +
                          ") ");
                }

                //保养完成，反写设备保养计划单子表是否点检标记
                oCn.RunProc("exec h_p_Sb_EquipMaintain_AfterSaveCtrl " + omodel.HEquipMaintainPlanInterID + "," + omodel.HEquipMaintainPlanEntryID);

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillMain.cs

@@ -16,7 +16,8 @@
        public int HEquipMaintainRuleInterID;
        public int HEquipDotCheckRuleInterID;


        public int HEquipDotCheckPlanInterID; //设备点检计划单（Sb_EquipDotCheckPlanBillSub_Plan）主内码
        public int HEquipDotCheckPlanEntryID; //设备点检计划单（Sb_EquipDotCheckPlanBillSub_Plan）子内码

    }
}

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs

@@ -15,6 +15,7 @@
        public Int64 HDeptID;
        public int HEquipMaintainRuleInterID;


        public int HEquipMaintainPlanInterID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）主内码
        public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码
    }
}

 WebAPI/Controllers/POStockInBillController.cs

@@ -4439,6 +4439,7 @@
                            jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());
                            jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());
                            jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());
                            jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//是否赠品
                            //jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());
                            //jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());
                            //jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());
@@ -5060,6 +5061,7 @@
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
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
,C.FGIVEAWAY AS FGIVEAWAY   
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
@@ -5143,6 +5145,7 @@
                                FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                                FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率
                                FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//是否赠品

                                JArray Fentity2 = new JArray();
                                JObject FentityModel2 = new JObject();

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs

@@ -355,6 +355,44 @@
        }
        #endregion

        #region[设备点检记录表，选点检计划获取点检计划清单信息]
        [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList")]
        [HttpGet]
        public object Sb_EquipDotCheckPlanBill_PlanList(string HInterID,string HDate)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheck_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipDotCheck_GetPlanList");

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查询到数据信息！";
                    objJsonResult.data = ds.Tables[0];
                }                           
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "发生异常，没有返回任何计划！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        #region[设备点检计划表编辑时获取表体数据--点检计划]
        [Route("Sb_EquipDotCheckPlanBill/GetPlanList")]
        [HttpGet]

 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs

@@ -413,6 +413,54 @@
        }
        #endregion

        #region[设备保养记录表，选保养计划获取保养计划清单信息]
        [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList")]
        [HttpGet]
        public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate)
        {
            DataSet ds,ds1;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                List<DataTable> tableList = new List<DataTable>();

                //获取保养项目
                ds = oCN.RunProcReturn("exec h_p_Sb_EquipMaintain_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipMaintain_GetPlanList");

                //获取配件项目编辑数据
                string sql1 = "select HMaterID, é…ä»¶ä»£ç  HMaterNumber,配件名称 HMaterName,单位ID HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,用量 HQty,标准用量 HQtyMust,表体备注 HRemark,负责人ID HManagerID,负责人代码 HManagerNumber,负责人 HManagerName  from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 and hmainid = " + HInterID;
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");

                tableList.Add(ds.Tables[0]);
                tableList.Add(ds1.Tables[0]);

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = tableList;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "没有查询到数据信息！";
                    objJsonResult.data = tableList;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "发生异常，没有返回任何计划！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        #region[设备保养计划表编辑时获取表体数据--保养计划]
        [Route("Sb_EquipMaintainPlanBill/GetPlanList")]
        [HttpGet]

 WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs

New file
@@ -0,0 +1,105 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Web.Http;
using WebAPI.DLL;
using WebAPI.Models;
using WebAPI.Service;
using Kingdee.BOS.WebApi.Client;

namespace WebAPI.Controllers
{
    public class Sc_ICMOBillWorkQtyStatus_TmpController : ApiController
    {
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        #region è®¾å¤‡äº§é‡é‡‡é›†åˆ—表
        [Route("Sc_ICMOBillWorkQtyStatus_Tmp/Sc_ICMOBillWorkQtyStatus_TmpList")]
        [HttpGet]
        public object Sc_ICMOBillWorkQtyStatus_TmpList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from Sc_ICMOBillWorkQtyStatus_TmpList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by é‡‡é›†æ—¶é—´ desc";
                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_TmpList");

                //添加列名
                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.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region è®¾å¤‡äº§é‡é‡‡é›†åˆ—表
        [Route("Sc_ICMOBillQualityStatus_Tmp/Sc_ICMOBillQualityStatus_TmpList")]
        [HttpGet]
        public object Sc_ICMOBillQualityStatus_TmpList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql1 = "select * from Sc_ICMOBillQualityStatus_TmpList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillQualityStatus_TmpList");

                //添加列名
                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.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -394,6 +394,83 @@
        //}
        #endregion



        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
        /// <param name="InterID">工序汇报单主ID</param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/SaveICMOReportBill_Batch")]
        [HttpPost]
        public object SaveICMOReportBill_Batch([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string InterID = sArray[0].ToString();
            string user = sArray[1].ToString();
            string BillNo = sArray[2].ToString();
            string OrganizationID = sArray[3].ToString();
            ArrayList InterIDArray = new ArrayList(InterID.Split(','));
            ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
            try
            {
                string bResult;
                string HMessage = "";
                string HSuccessBillNo = "";
                string HFailBillNo = "";
                WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();
                if (InterIDArray.Count != BillNoArray.Count)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "数据不完整，内码数量不等于单据号数量";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    for (int i = 0; i < InterIDArray.Count;i++)
                    {
                        bResult = JsonConvert.SerializeObject(oBill.SaveICMOReportBill(InterIDArray[i].ToString(), user, BillNoArray[i].ToString(), OrganizationID));

                        //反序列化
                        bResult = "[" + bResult.ToString() + "]";

                        List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);

                        if (list[0].count == 1)
                        {
                            HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString()+"," + "\r\n" ;
                        }
                        else
                        {
                            HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
                        }
                        HMessage = "汇报成功单号：" + HSuccessBillNo + "\r\n" + "  æ±‡æŠ¥å¤±è´¥å•å·ï¼š" + HFailBillNo;
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = HMessage;
                objJsonResult.data = null;
                return objJsonResult;

            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
@@ -613,6 +690,71 @@
            }
        }

        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
        /// <param name="InterID">工序汇报单主ID</param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/SaveProcdutInBill_Batch")]
        [HttpPost]
        public object SaveProcdutInBill_Batch([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string BillNo = sArray[0].ToString();
            BillNo = BillNo.Replace("\r\n", "").Replace("[ ", "").Replace("]", "");
            BillNo = BillNo.Replace("\\", "").Replace("\n", "").Replace("\"", "");
            BillNo = BillNo.Trim();
            ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
          
            try
            {
                string bResult;
                string HMessage = "";
                string HSuccessBillNo = "";
                string HFailBillNo = "";
                WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();

                for (int i = 0; i < BillNoArray.Count; i++)
                {
                    bResult = JsonConvert.SerializeObject(oBill.SaveProcdutInBill(BillNoArray[i].ToString().Trim()));

                    //反序列化
                    bResult = "[" + bResult.ToString() + "]";

                    List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);

                    if (list[0].count == 1)
                    {
                        HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString() + "," + "\r\n";
                    }
                    else
                    {
                        HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
                    }
                    HMessage = "入库成功单号：" + HSuccessBillNo + "\r\n" + "  å…¥åº“失败单号：" + HFailBillNo;
                }
                

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = HMessage;
                objJsonResult.data = null;
                return objJsonResult;

            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// å…¥åº“——产品入库单

 WebAPI/Web.config

@@ -51,8 +51,9 @@
      </system.Web>
  -->
    <system.web>
        <customErrors mode="Off"/>
        <compilation debug="true" targetFramework="4.5" />
        <httpRuntime />
        <httpRuntime maxQueryStringLength="102400" />
        <pages controlRenderingCompatibilityVersion="4.0" />
    </system.web>


 WebAPI/WebAPI.csproj

@@ -425,6 +425,8 @@
    <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
    <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ICMOBillQualityStatus_TmpController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\DataHelper.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\JIT_Cg_PODemandPlanBillController.cs" />