ch
2022-09-01 c7cfb07c1d5941a2023431c4b41519dcb2b0f872
新增了出站汇报单显示流转卡信息  批量汇报功能
30个文件已修改
410 ■■■■ 已修改文件
BLL/公用模块/FrmLogin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/bin/x86/Debug/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 223 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/流转卡管理/MES_StationOutBill.cs 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BLL/¹«ÓÃÄ£¿é/FrmLogin.cs
@@ -100,6 +100,7 @@
        private void btnOK_Click(object sender, EventArgs e)  //Lock
        {
            if (AllowLogin() != true)
                return;
            DataSet ds = null;
PayM/bin/x86/Debug/BLL.dll
Binary files differ
PayM/bin/x86/Debug/BLL.pdb
Binary files differ
PayM/bin/x86/Debug/DAL.dll
Binary files differ
PayM/bin/x86/Debug/DAL.pdb
Binary files differ
PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/bin/x86/Debug/Model.dll
Binary files differ
PayM/bin/x86/Debug/Model.pdb
Binary files differ
PayM/bin/x86/Debug/PayM.dll
Binary files differ
PayM/bin/x86/Debug/PayM.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
08bc7f9ad52dac46a486d601aad75ab55bfbf42b
b14f4fcc24537f5a4b1d1021595a00930f37f5f5
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
Binary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache
Binary files differ
PayM/obj/x86/Debug/PayM.dll
Binary files differ
PayM/obj/x86/Debug/PayM.pdb
Binary files differ
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -129,6 +129,43 @@
        }
        #endregion
        #region å‡ºç«™æ±‡æŠ¥å•显示表体明细
        [Route("Cj_StationEntrustInBill/DisBillEntryList")]
        [HttpGet]
        public object DisBillEntryList(Int64 HProcExchHinteID)
        {
            try
            {
                //得到信息
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcExchBilltransRelationQty " + HProcExchHinteID + "", "h_p_Sc_ProcExchBilltransRelationQty");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到出站单明细信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                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("Cj_StationEntrustInBill/AddBill")]
        [HttpPost]
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -400,6 +400,229 @@
            }
        }
        /// <summary>
        /// æ–°å¢žå•据-批量出站单保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Cj_StationOutBill/AddBill_Mul")]
        [HttpPost]
        public object AddBill_Mul([FromBody] JObject oMain)
        {
            string UserName = "";
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
                List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                ListModels oListModels = new ListModels();
                list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2);
                int i = 0;
                foreach (Model.ClsSc_StationOutBillMain oItemSub in list)
                {
                    i++;
                    long HMainInterID = 0;
                    HMainInterID = list[0].HInterID;
                    string eventType = "";
                    string BillType = "3791";
                    string HBillSubType = "3791";
                    long HInterID = list[0].HInterID;//递入type得到的单据ID
                    string HBillNo = msg3 + "- " + i;//递入type得到的单据号
                    int HBillStatus = 0;
                    string HMaker = list[0].HMaker;//制单人
                    string HMouldNum = list[0].HMouldNum;//模穴号
                    int HYear = 2021;
                    double HPeriod = 1;
                    string HRemark = list[0].HRemark;//备注
                    string HSourceName = list[0].HSourceName;//生产资源名称
                    double HPieceQty = list[0].HPieceQty;//进站PCS数
                    double HWasterQty = list[0].HWasterQty;//报废数量
                    double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
                    double HBadPNL = list[0].HBadPNL;//报废PNL数
                    long HICMOInterID = list[0].HICMOInterID;//任务单ID
                    string HICMOBillNo = list[0].HICMOBillNo;//任务单
                    int HProcPlanInterID = 0;
                    int HProcPlanEntryID = 0;
                    string HProcPlanBillNo = "";
                    long HProcExchInterID = list[0].HProcExchInterID;
                    long HProcExchEntryID = list[0].HProcExchEntryID;
                    string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                    long HMaterID = list[0].HMaterID;//产品ID
                    long HProcID = list[0].HProcID;//当前工序ID
                    double HICMOQty = list[0].HICMOQty;//任务单数量
                    double HPlanQty = list[0].HPlanQty;//移交PNL数
                    DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
                    long HSourceID = list[0].HSourceID;//生产资源ID
                    long HPayProcID = list[0].HPayProcID;//核算工序ID
                    long HGroupID = list[0].HGroupID;//班组ID
                    long HDeptID = 0;
                    long HEmpID = list[0].HEmpID;//操作员ID
                    string HBarCode = list[0].HBarCode;//条形码
                    string HAddr = "";
                    string HBarCodeMaker = "";
                    long HSourceID2 = list[0].HSourceID2;//生产资源2ID
                    long HSourceID3 = list[0].HSourceID3;//生产资源3ID
                    long HSourceID4 = list[0].HSourceID4;//生产资源4ID
                    long HSourceID5 = list[0].HSourceID5;//生产资源5ID
                    long HSupID = 0;
                    double HQty = list[0].HQty;//合格数量
                    double HPrice = 0;
                    double HMoney = 0;
                    double HBadCount = list[0].HBadCount;//不良数量
                    long HCenterID = list[0].HCenterID;//工作中心ID
                    long HProcNo = list[0].HProcNo;//流水号
                    string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                    string HSourceNameList = list[0].HSourceNameList;//设备清单
                    long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
                    string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
                    string HMainSourceBillType = "3790";
                    bool HLastSubProc = list[0].HLastSubProc;//转下工序
                    long HEmpID2 = list[0].HEmpID2;//操作员2ID
                    long HEmpID3 = list[0].HEmpID3;//操作员3ID
                    long HEmpID4 = list[0].HEmpID4;//操作员4ID
                    long HEmpID5 = list[0].HEmpID5;//操作员5ID
                    double HDSQty = list[0].HDSQty;//折弯刀数
                    double HChongQty = list[0].HChongQty;//NCT冲次数
                    double HPriceRate = list[0].HPriceRate;//系数
                    double HWorkTimes = list[0].HWorkTimes;//工时
                    long HQCCheckID = list[0].HQCCheckID;//检验员ID
                    //保存
                    //保存完毕后处理
                    bool bResult;
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    if (bResult)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "保存成功!";
                        //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        //递入物料信息 è¿”回未完全汇报的流转卡
        [Route("LEMS/Sc_StationOutBill_Mul_RYQ")]
        [HttpGet]
        public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                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;
            }
        }
        //选中网格里面的某一行流转卡  è¿”回该流转卡的进出站情况
        [Route("LEMS/Mul_RYQ_DisPlayBillList")]
        [HttpGet]
        public object Mul_RYQ_DisPlayBillList(String HBillNo,String HProcName)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                DataSet ds = oCN.RunProcReturn("exec h_P_Mul_RYQ_DisPlayBillList '" + HBillNo + "','" + HProcName + "'", "h_P_Mul_RYQ_DisPlayBillList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                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;
            }
        }
        private bool AllowbillNo(string HBillNo)
        {
            ds = oCN.RunProcReturn("select HBillNo from Sc_StationOutBillMain where  HBillNo = '" + HBillNo + "'", "Sc_StationOutBillMain");
WebAPI/ListModels.cs
@@ -570,6 +570,18 @@
        }
        /// <summary>
        /// å¤„理新增出站汇报单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_StationOutBillMain> getObjectByJson_Sc_StationOutBillMain(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_StationOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_StationOutBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具保养计划单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
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>08/08/2022 14:58:19</publishTime>
      <publishTime>08/31/2022 22:29:38</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/08/2022 14:58:19</publishTime>
      <publishTime>08/31/2022 22:29:38</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/08/2022 14:58:18</publishTime>
      <publishTime>08/31/2022 22:29:36</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/08/2022 14:58:18</publishTime>
      <publishTime>08/31/2022 22:29:36</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/08/2022 14:58:16</publishTime>
      <publishTime>08/31/2022 22:29:35</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/08/2022 14:58:16</publishTime>
      <publishTime>08/31/2022 22:29:35</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>08/08/2022 14:58:17</publishTime>
      <publishTime>08/31/2022 22:29:35</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/08/2022 14:58:17</publishTime>
      <publishTime>08/31/2022 22:29:35</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>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/08/2022 14:58:15</publishTime>
      <publishTime>08/31/2022 22:29:34</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>08/08/2022 14:58:22</publishTime>
      <publishTime>08/31/2022 22:29:40</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/08/2022 14:58:22</publishTime>
      <publishTime>08/31/2022 22:29:40</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>07/27/2022 08:46:55</publishTime>
      <publishTime>08/16/2022 22:31:46</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>03/15/2022 10:06:42</publishTime>
@@ -390,61 +390,61 @@
      <publishTime>03/15/2022 10:06:42</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>06/12/2022 16:45:50</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>06/12/2022 16:45:50</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>06/12/2022 16:45:50</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>06/12/2022 16:45:52</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>06/12/2022 16:45:52</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>06/12/2022 16:45:52</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>06/12/2022 16:45:52</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>06/12/2022 16:45:51</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>06/12/2022 16:45:52</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>06/12/2022 16:45:50</publishTime>
      <publishTime>08/26/2022 16:04:31</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.cs">
      <publishTime>12/20/2021 13:19:56</publishTime>
@@ -459,7 +459,7 @@
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/08/2022 14:58:31</publishTime>
      <publishTime>08/31/2022 22:29:47</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.190.4.42:9003/WebService/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.190.4.42:9003/WebService/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>
@@ -100,7 +100,7 @@
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://60.190.4.42:9003/WebService/WebService1.asmx</value>
        <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>
WorkM/Á÷ת¿¨¹ÜÀí/MES_StationOutBill.cs
@@ -473,7 +473,7 @@
        //单据完整性判断          æœªå®Œæˆ
        private bool Sub_AllowSave()
        {
        {
            //判断该用户名是否有该工站权限
            //if (BillNew.CheckCenterIDByUser(DBUtility.ClsPub.isLong(txtHCenterID.Tag)) == false)
            //{
@@ -523,6 +523,49 @@
            //        return false;
            //    }
            //}
            //模穴号控制
            //if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "13000001197")
            //{
            //    string HMXH = "";
            //    string HZM = "";
            //    HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
            //    HZM = HMXH.Substring(0, 1);
            //    if (HZM != "G")
            //    {
            //        MessageBox.Show("模穴号错误第一位请重新输入G");
            //        return false;
            //    }
            //}
            if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0207" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "成品检验")
            {
                string HMXH = "";
                string HZM = "";
                HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
                HZM = HMXH.Substring(0, 1);
                if (HZM != "G")
                {
                    MessageBox.Show("模穴号错误第一位请重新输入G");
                    return false;
                }
            }
            if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0268" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "成品检验")
            {
                string HMXH = "";
                string HZM = "";
                HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
                HZM = HMXH.Substring(0, 1);
                if (HZM != "X")
                {
                    MessageBox.Show("模穴号错误第一位请重新输入X");
                    return false;
                }
            }
            //必输项目是否为空
            if (DBUtility.ClsPub.isLong(lngBillKey) <= 0)
@@ -576,11 +619,11 @@
                MessageBox.Show("操作员没有选择!", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isLong(txtHQCCheckID.Tag) == 0)
            {
                MessageBox.Show("检验员没有选择!", "提示");
                return false;
            }
            //if (DBUtility.ClsPub.isLong(txtHQCCheckID.Tag) == 0)
            //{
            //    MessageBox.Show("检验员没有选择!", "提示");
            //    return false;
            //}
            if (DBUtility.ClsPub.isLong(txtHSourceID.Tag) == 0)
            {
                MessageBox.Show("生产资源没有选择!", "提示");