凯贝

zzr99

2022-07-30 fdb657a8fa5e3c52f48672179370ec6f3039cc74

凯贝

 WebAPI/Controllers/Sc_PckSplitBillController.cs

@@ -380,7 +380,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "暂无数据" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -388,7 +388,7 @@
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "暂无数据";
                    objJsonResult.Message = "查询成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -405,20 +405,82 @@
        }
        #endregion

        #region 产线关键件绑定SN号查询
        [Route("Sc_PckSplit/Get_PHPCruxBillList")]
        #region 产线关键件绑定
        /// <summary>
        /// SN号查询
        /// </summary>
        /// <param name="HBarCode">SN号</param>
        /// <returns></returns>
        [Route("Sc_PckSplit/Get_PHPCruxSNBillList")]
        [HttpGet]
        public Object Get_PHPCruxBillList(string HBarCode)
        public Object Get_PHPCruxSNBillList(int HinterID, string HBarCode,int HProcID,string HBillNo)
        {
            try
            {
                string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
                DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
                string sql1 = string.Format($"exec h_p_Sc_PHPCruxSNBillTOTemp '"+HBarCode+"',"+HinterID+","+HProcID+",'"+ HBillNo+"'");
                DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxSNBillTOTemp");
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "暂无数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["sel"]) ==0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "暂无数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else{
                    //先存进临时表再返回数据
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "查询成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 关键码查询
        /// </summary>
        /// <param name="HBarCode">关键码</param>
        /// <returns></returns>
        [Route("Sc_PckSplit/Get_PHPCruxBillList")]
        [HttpGet]
        public Object Get_PHPCruxBillList(int HinterID,string HPCrux,string HBillNo)
        {
            try
            {
                string sql1 = string.Format($"exec h_p_Sc_PHPCruxBillTOTemp '" +HPCrux+"',"+ HinterID+",'"+ HBillNo+"'");
                DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxBillTOTemp");
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到条形码信息！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
                {
                    objJsonResult.code = "2";
                    objJsonResult.count = 2;
                    objJsonResult.Message = "错误！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -427,7 +489,7 @@
                    //先存进临时表再返回数据
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "暂无数据";
                    objJsonResult.Message = "查询成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -442,6 +504,130 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// 扫码缓存删除
        /// </summary>
        /// <param name="HBarCode">关键码</param>
        /// <returns></returns>
        [Route("Sc_PckSplit/Delete_PHPCruxBillListByME")]
        [HttpGet]
        public Object Delete_PHPCruxBillListByME(int HInterID,int HMaterID,string HBarCode)
        {
            try
            {
                oCn.BeginTran();
                string sql = string.Format(@"delete Sc_AssemblyBill_BindBarCodeTemp where HInterID="+ HInterID+" and HMaterID="+ HMaterID+ " and HBarCode='" + HBarCode+"'");
                oCn.RunProc(sql);
                //删除成功
                string sql1= string.Format(@"select  a.HEntryID,a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,1 HQty,HBarCode HPJM
                            from Sc_AssemblyBill_BindBarCodeTemp a left join Gy_Material m on a.HMaterID=m.HItemID
                            where HInterID=" + HInterID);
                DataSet ds=oCn.RunProcReturn(sql1, "Sc_AssemblyBill_BindBarCodeTemp");
                oCn.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 组装单提交
        /// </summary>
        /// <param name="HBarCode">关键码</param>
        /// <returns></returns>
        [Route("Sc_PckSplit/Add_PHPCruxBillList")]
        [HttpPost]
        public Object Add_PHPCruxBillList([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();//基本资料
            string msg3 = sArray[1].ToString();//配件列表
            string msg4 = sArray[2].ToString();//条码列表
            string msg5 = sArray[3].ToString();//登录人
            ListModels oListModels = new ListModels();
            long HinterID;
            string HBillNo = "";

            try
            {
                DLL.ClsSc_PHPCruxBillBill oBill = new DLL.ClsSc_PHPCruxBillBill();
                List<Models.ClsSc_AssemblyBillMain> lsmain = new List<Models.ClsSc_AssemblyBillMain>();//基本资料
                List<Models.ClsSc_AssemblyBillMain> lspjItme = new List<Models.ClsSc_AssemblyBillMain>();//配件列表
                List<Models.ClsSc_AssemblyBillSub> lstmItme = new List<Models.ClsSc_AssemblyBillSub>();//扫码列表
                //基本资料_json格式转换
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  
                lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain(msg2);

                HinterID = lsmain[0].HInterID;//主ID
                HBillNo = lsmain[0].HBillNo;//单据号


                //事务开始
                oCn.BeginTran();
                //根据interID在源单临时表中查找数据
                DataSet ds1 = oCn.RunProcReturn("select top 1 * from Sc_AssemblyBill_BindSourceTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindSourceTemp");
               //保存生产组装单主表
                string sql = "Insert Into Sc_AssemblyBillMain   " +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate," +
                        "HBillNo,HBillStatus,HMaker,HMakeDate" +
                        ",HMainSourceInterID,HMainSourceBillNo" +
                        ",HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus" +
                        ") " +
                        " values('" + DateTime.Now.Year + "','" + DateTime.Now.Month + "',3727,3727," + HinterID + ",'" + DateTime.Now+
                        "','" + HBillNo + "',1,'"+msg5+"',getdate()" +
                        ",0,'" + lsmain[0].HBarCode + "'" + 
                        "," + ds1.Tables[0].Rows[0]["HSourceInterID"].ToString() + ",'" + ds1.Tables[0].Rows[0]["HSourceBillNo"].ToString() + "','" + lsmain[0].HBarCode + "',0,0,'生产中'" + 
                        ") ";
                oCn.RunProc(sql);

                //根据interID在扫码临时表中查找数据
                DataSet ds2 = oCn.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindBarCodeTemp");
                for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
                {
                    string sq2 = "Insert Into Sc_AssemblyBillSub   " +
                        "(HInterID,HBillNo_bak,HEntryID," +
                        "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                        ",HMaterID,HSourceID,HEquipID,HUnitID,HQty,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber" +
                        ") " +
                        " values(" + HinterID + ",'" + HBillNo + "'," + i +
                        "," + ds2.Tables[0].Rows[i]["HSourceInterID"].ToString() + "," + ds2.Tables[0].Rows[i]["HSourceEntryID"].ToString() + ",'" + ds2.Tables[0].Rows[i]["HSourceBillNo"].ToString() + "'" +
                        ",''," + ds2.Tables[0].Rows[i]["HMaterID"].ToString() + ",'"+ lsmain[0].HSCZYID + "',0,0,1," + lsmain[0].HGroupID + "," + lsmain[0].HKeeperID + ",getdate(),'" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + lsmain[0].HBarCode + "'" +
                        ") ";
                    oCn.RunProc(sq2);
                }
                oCn.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message ="提交成功";
                objJsonResult.data =null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -219,7 +219,9 @@
                model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //单据类型生产汇报“SCHBD02_SYS” 入库汇报SCHBD01_SYS
                model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
                model.Add("FHZYMESFLAG", "是");//  是否为MES同步
                JArray Fentity = new JArray();

                foreach (DataRow item in ds.Tables[0].Rows)
                {
                    JObject FentityModel = new JObject();
@@ -318,7 +320,7 @@
                    Ids = fID,
                };
                result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//审核
                result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();

 WebAPI/DLL/ClsSc_PHPCruxBillBill.cs

New file
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.DLL
{
    public class ClsSc_PHPCruxBillBill : DBUtility.ClsXt_BaseBill
    {
        public Models.ClsSc_AssemblyBillMain omodel = new Models.ClsSc_AssemblyBillMain();
        public List<Models.ClsSc_AssemblyBillSub> DetailColl = new List<Models.ClsSc_AssemblyBillSub>();

        public ClsSc_PHPCruxBillBill()
        {
            base.MvarItemKeySub = "Sc_AssemblyBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Sc_AssemblyBillMain";
            base.MvarReportTitle = "生产组装单";
            base.BillType = "3727";
            base.HBillSubType = "3727";
        }
    }
}

 WebAPI/ListModels.cs

@@ -1985,5 +1985,28 @@
            return list;
        }

        /// <summary>
        /// 组装追溯-主
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 组装追溯-子
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillSub>>(jsonString);
            return list;
        }

    }
} 

 WebAPI/Models/ClsSc_AssemblyBillMain.cs

New file
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class ClsSc_AssemblyBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HICMOInterID;//   int                --任务单ID（扫码产品条码带出）
        public Int64 HMaterID = 0;//    int                 --产品ID
        public Int64 HUnitID=0;//  int                   --单位ID   
        public string HICMOBillNo;//   varchar(200)        --任务单号 （扫码产品条码带出）
        public string HBarCode_P;//  varchar(50)         --产品条形码
        public string HAssemblyStatus; //组装状态（生产中，汇报，检验，包装，入库）
        public string HCPM;
        public int HGroupID;
        //public string HGroupName;
        public int HKeeperID;
        //public string HKeeperName;
        public string HBarCode;
        //public string HProc;
        public int HProcID;
        public string HPCrux;
        public string HSCZY;
        public int HSCZYID;
    }
}

 WebAPI/Models/ClsSc_AssemblyBillSub.cs

New file
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class ClsSc_AssemblyBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HMaterID;//     int               --物料ID
        public Int64 HUnitID;//  单位ID
        public double HQty;//        数量
        public Int64 HSourceID;//    生产资源ID（非必要）
        public Int64 HEquipID;//    生产设备ID（非必要）
        public Int64 HGroupID;//        生产班组ID（非必要）	 
        public Int64 HWorkerID;//    操作工ID（非必要）
        public string HScanDate;//    --扫描时间
        public string HBarCode;//    varchar(50) --条形码
        public string HBarCode_P;//    varchar(50) --产品条码
        public string HSNNumber;//    SN号（非必填）
        public string HPJM;

    }
}

 WebAPI/WebAPI.csproj

@@ -537,6 +537,7 @@
    <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
    <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
    <Compile Include="DLL\ClsSc_PackUnionBill.cs" />
    <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
    <Compile Include="DLL\ClsSc_ProcessPlan.cs" />
    <Compile Include="DLL\ClsWW_PPBomBill.cs" />
    <Compile Include="DLL\工资管理\ClsPay_GroupBalBill.cs" />
@@ -545,6 +546,8 @@
    <Compile Include="HttpClient.cs" />
    <Compile Include="InvokeHelper.cs" />
    <Compile Include="Log.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
    <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />