Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-08-01 baaa9227a9e0b720ce2f4bca20b18d270982ee93

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 LMES/bin/x86/Debug.rar

Binary files differ

 LMES/bin/x86/Debug.zip

Binary files differ

 WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs

@@ -1047,7 +1047,7 @@
                                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
                                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HPrdDate,HBC,HInnerBillNo " +
                                            ") values ("
                                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
                                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1055,7 +1055,7 @@
                                            + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                            + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
                                            + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
                                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
                                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HPrdDate + "','" + HBC + "','" + HInnerBillNo + "')");

                        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
                        DisplayTM();
@@ -1603,7 +1603,7 @@
        private void DisplayTM()
        {
            //HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹ = '托盘条码' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹ = '托盘条码' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
            if (DSet == null)
            {

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -552,6 +552,25 @@
                objJsonResult.data = null;
                return objJsonResult;
            }


            //删除前判断关联数量
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet ds;
            ds = oCn.RunProcReturn("select ct from (  " +
                          "  select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
                          "  union all " +
                          "  select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a  ", "Sc_ProcExchReportSub");
            if (ds.Tables[0].Rows.Count != 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "流转卡已经有下游进出站单后，不允许删除！";
                objJsonResult.data = null;
                return objJsonResult;
            }


            DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
            DBUtility.ClsPub.HOrgID = HPRDORGID;
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))

 WebAPI/Controllers/LMESController.cs

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

                ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by HEntryID", "h_v_IF_ICMOBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by å•æ®å· desc", "h_v_IF_ICMOBillList");
            }
            catch (Exception e)
            {

 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/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -18,28 +18,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/18/2022 18:17:10</publishTime>
      <publishTime>07/31/2022 12:56:21</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/18/2022 18:17:10</publishTime>
      <publishTime>07/31/2022 12:56:21</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/18/2022 18:17:09</publishTime>
      <publishTime>07/31/2022 12:56:19</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/18/2022 18:17:09</publishTime>
      <publishTime>07/31/2022 12:56:19</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/18/2022 18:17:07</publishTime>
      <publishTime>07/31/2022 12:56:12</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/18/2022 18:17:07</publishTime>
      <publishTime>07/31/2022 12:56:12</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/18/2022 18:17:08</publishTime>
      <publishTime>07/31/2022 12:56:15</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/18/2022 18:17:08</publishTime>
      <publishTime>07/31/2022 12:56:15</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/18/2022 18:17:06</publishTime>
      <publishTime>07/31/2022 12:56:10</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/18/2022 18:17:06</publishTime>
      <publishTime>07/31/2022 12:56:10</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/18/2022 18:17:06</publishTime>
      <publishTime>07/31/2022 12:56:11</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/18/2022 18:17:06</publishTime>
      <publishTime>07/31/2022 12:56:11</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/18/2022 18:17:07</publishTime>
      <publishTime>07/31/2022 12:56:11</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/18/2022 18:17:07</publishTime>
      <publishTime>07/31/2022 12:56:11</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/18/2022 18:17:15</publishTime>
      <publishTime>07/31/2022 12:56:25</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/18/2022 18:17:15</publishTime>
      <publishTime>07/31/2022 12:56:25</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -273,7 +273,7 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>06/28/2022 08:44:51</publishTime>
      <publishTime>07/27/2022 08:46:55</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
@@ -459,7 +459,7 @@
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/18/2022 18:17:23</publishTime>
      <publishTime>07/31/2022 12:56:38</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Web.config

@@ -22,7 +22,7 @@
      <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
      <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> é¢œå°å¼æœº-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
      <add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" /> 
      <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> 
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
      <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    ç‘žä¸Žç¥º-->
      <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/>    æ£®æ¥·-->
@@ -92,7 +92,7 @@
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
      <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
        bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
        name="WebService1Soap" />
    </client>

 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" />

 WorkM/±¨±í·ÖÎö/MES_ICMOBillStatusReport.cs

@@ -140,8 +140,9 @@
            DataSet DSet = new DataSet();
            //过滤条件Dlg
            string sDlgWhere = "";
            sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
            sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
            //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
            //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + cmbHICMOBillStatus.Text.Trim() + "'";

 WorkM/±¨±í·ÖÎö/MES_ICMOBillStatusReport.designer.cs

@@ -32,6 +32,9 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_ICMOBillStatusReport));
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.Tool = new System.Windows.Forms.ToolStrip();
            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
            this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.yl = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
            this.cx = new System.Windows.Forms.ToolStripButton();
@@ -58,9 +61,8 @@
            this.timer2 = new System.Windows.Forms.Timer(this.components);
            this.grdMain = new System.Windows.Forms.DataGridView();
            this.grdSum = new System.Windows.Forms.DataGridView();
            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
            this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.label4 = new System.Windows.Forms.Label();
            this.txtHMaterName = new System.Windows.Forms.TextBox();
            this.Tool.SuspendLayout();
            this.pPic.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -98,6 +100,34 @@
            this.Tool.Stretch = true;
            this.Tool.TabIndex = 16;
            this.Tool.Text = "toolStrip1";
            // 
            // toolStripDropDownButton1
            // 
            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.eXCELToolStripMenuItem,
            this.cSVToolStripMenuItem});
            this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
            this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
            this.toolStripDropDownButton1.Text = "引出";
            this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            // 
            // eXCELToolStripMenuItem
            // 
            this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
            this.eXCELToolStripMenuItem.Text = "EXCEL";
            this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
            // 
            // cSVToolStripMenuItem
            // 
            this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
            this.cSVToolStripMenuItem.Text = "CSV";
            this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
            // 
            // yl
            // 
@@ -208,6 +238,8 @@
            this.pPic.BackColor = System.Drawing.Color.White;
            this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
            this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
            this.pPic.Controls.Add(this.label4);
            this.pPic.Controls.Add(this.txtHMaterName);
            this.pPic.Controls.Add(this.label6);
            this.pPic.Controls.Add(this.txtHProcessExchangeBillNo);
            this.pPic.Controls.Add(this.cmbHICMOBillStatus);
@@ -249,7 +281,8 @@
            this.cmbHICMOBillStatus.Items.AddRange(new object[] {
            "全部",
            "WMS结案",
            "未结案"});
            "未结案",
            "K3结案"});
            this.cmbHICMOBillStatus.Location = new System.Drawing.Point(723, 3);
            this.cmbHICMOBillStatus.Name = "cmbHICMOBillStatus";
            this.cmbHICMOBillStatus.Size = new System.Drawing.Size(143, 20);
@@ -290,6 +323,7 @@
            this.dtpHEDate.Name = "dtpHEDate";
            this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
            this.dtpHEDate.TabIndex = 10;
            this.dtpHEDate.Visible = false;
            // 
            // label1
            // 
@@ -300,6 +334,7 @@
            this.label1.Size = new System.Drawing.Size(53, 12);
            this.label1.TabIndex = 7;
            this.label1.Text = "开始日期";
            this.label1.Visible = false;
            // 
            // label2
            // 
@@ -310,6 +345,7 @@
            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 8;
            this.label2.Text = "结束日期";
            this.label2.Visible = false;
            // 
            // dtpHBDate
            // 
@@ -318,6 +354,7 @@
            this.dtpHBDate.Name = "dtpHBDate";
            this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
            this.dtpHBDate.TabIndex = 9;
            this.dtpHBDate.Visible = false;
            // 
            // lblCaption
            // 
@@ -368,33 +405,22 @@
            this.grdSum.Size = new System.Drawing.Size(1190, 19);
            this.grdSum.TabIndex = 49;
            // 
            // toolStripDropDownButton1
            // label4
            // 
            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.eXCELToolStripMenuItem,
            this.cSVToolStripMenuItem});
            this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
            this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
            this.toolStripDropDownButton1.Text = "引出";
            this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
            this.label4.AutoSize = true;
            this.label4.BackColor = System.Drawing.Color.Transparent;
            this.label4.Location = new System.Drawing.Point(654, 32);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(53, 12);
            this.label4.TabIndex = 114;
            this.label4.Text = "产品名称";
            // 
            // eXCELToolStripMenuItem
            // txtHMaterName
            // 
            this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
            this.eXCELToolStripMenuItem.Text = "EXCEL";
            this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
            // 
            // cSVToolStripMenuItem
            // 
            this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
            this.cSVToolStripMenuItem.Text = "CSV";
            this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
            this.txtHMaterName.Location = new System.Drawing.Point(723, 28);
            this.txtHMaterName.Name = "txtHMaterName";
            this.txtHMaterName.Size = new System.Drawing.Size(143, 21);
            this.txtHMaterName.TabIndex = 113;
            // 
            // MES_ICMOBillStatusReport
            // 
@@ -454,5 +480,7 @@
        private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
        private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
        private System.Windows.Forms.Label label4;
        public System.Windows.Forms.TextBox txtHMaterName;
    }
}