1

duhe

2023-09-18 00d2dab9f1367067b27906be93a43949beb43aa7

1

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

@@ -594,6 +594,11 @@
                MessageBox.Show("工序不允许为空，请先输入流水号后回车确认！", "提示");
                return false;
            }
            else if (DBUtility.ClsPub.isInt(txtHProcNo.Text) == 0)
            {
                MessageBox.Show("请输入正确流水号！", "提示");
                return false;
            }
            else if (DBUtility.ClsPub.isLong(txtHSourceID.Tag) == 0)
            {
                MessageBox.Show("生产资源不允许为空，请先选择生产资源！", "提示");
@@ -973,13 +978,13 @@
        {
            if (e.KeyCode == Keys.Return)
            {
                if (txtHProcNo.Text == "")
                if (DBUtility.ClsPub.isLong(txtHProcNo.Text) == 0)
                {
                    MessageBox.Show("流水号为空，请输入流水号！");
                    MessageBox.Show("流水号为空或所输入流水号不正确，请重新输入流水号！");
                    return;
                }
                //根据转卡主ID、流水号带出流转卡上相应工序、班组、工作中心、生产资源
                DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo " + HProcessExchangeInterID.ToString() + "," + txtHProcNo.Text, "h_p_KF_GetBCPWeighSource_HProcNo");
                DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_HProcNo2 " + HProcessExchangeInterID.ToString() + "," + DBUtility.ClsPub.isLong(txtHProcNo.Text) + ",'" + DBUtility.ClsPub.CurUserID + "'", "h_p_KF_GetBCPWeighSource_HProcNo2");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    txtHProcNo.Text = "";
@@ -991,7 +996,7 @@
                    txtHGroupID.Text = "";
                    txtHSourceID.Tag = 0;
                    txtHSourceID.Text = "";
                    MessageBox.Show("所输入流水号不在当前工序流转卡下，请重新输入流水号！");
                    MessageBox.Show("所输入流水号不在当前工序流转卡下或用户未关联该流水号所对应相关工序，请重新输入流水号！");
                    return;
                }
                else

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -6,7 +6,10 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Web;
using System.Web.Http;
using WebAPI.Controllers.SCGL.日计划管理;
using WebAPI.Models;
using WebAPI.Service;

@@ -307,6 +310,359 @@
            return model;
        }

        #region ç”Ÿäº§èµ„源 æ–‡ä»¶ä¸Šä¼ 
        [Route("Gy_Source/Gy_Source_Excel")]
        [HttpPost]
        public object Gy_Source_Excel()
        {
            try
            {
                //获取文件名称
                var file = HttpContext.Current.Request.Files[0];
                //获取文件物理路径
                string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
                //保存文件
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

                //删除文件
                File.Delete(ExcelPath);

                //创建临时表
                DataTable tb2 = new DataTable("dt2");

                //添加列名
                for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
                {
                    tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
                }

                //模板缺少列 ä½†éœ€è¦ä»Žæ•°æ®åº“中查询出来显示在页面的字段
                tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID
                tb2.Columns.Add("HDeptID", typeof(Int32));//部门ID
                tb2.Columns.Add("HEmpID", typeof(Int32));//负责人ID
                tb2.Columns.Add("HWorkCenterID", typeof(Int32));//工作中心ID

                //添加数据
                for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
                {
                    DataRow row = tb2.NewRow();
                    for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    tb2.Rows.Add(row);
                }


                var error = "";

                //查询工艺路线没有的列
                if (!tb2.Columns.Contains("组织代码"))
                    error += "没有找到【组织代码】的标题,";

                if (!tb2.Columns.Contains("组织名称"))
                    error += "没有找到【组织名称】的标题,";

                if (!tb2.Columns.Contains("生产资源名称"))
                    error += "没有找到【生产资源名称】的标题,";

                if (!tb2.Columns.Contains("生产资源代码"))
                    error += "没有找到【生产资源代码】的标题,";

                if (!tb2.Columns.Contains("部门代码"))
                    error += "没有找到【部门代码】的标题,";

                if (!tb2.Columns.Contains("部门名称"))
                    error += "没有找到【部门名称】的标题,";

                if (!tb2.Columns.Contains("负责人代码"))
                    error += "没有找到【负责人代码】的标题,";

                if (!tb2.Columns.Contains("负责人"))
                    error += "没有找到【负责人】的标题,";

                if (!tb2.Columns.Contains("工作中心代码"))
                    error += "没有找到【工作中心代码】的标题,";

                if (!tb2.Columns.Contains("工作中心名称"))
                    error += "没有找到【工作中心名称】的标题,";

                if (!tb2.Columns.Contains("单班工时"))
                    error += "没有找到【单班工时】的标题,";

                if (error.Length > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                for (int i = 0; i <= tb2.Rows.Count - 1; i++)
                {
                    string HSourceName = "";
                    string HSourceNum = "";
                    string HORGNumber = "";
                    string HORGName = "";
                    string HDeptNum = "";
                    string HDeptName = "";
                    string HEmpNum = "";
                    string HEmpName = "";
                    string HCentNum = "";
                    string HCentName = "";
                    string HWorkTime = "";

                    HSourceName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源名称"].ToString());
                    HSourceNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源代码"].ToString());
                    HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织代码"].ToString());
                    HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织名称"].ToString());
                    HDeptNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["部门代码"].ToString());
                    HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["部门名称"].ToString());
                    HEmpNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["负责人代码"].ToString());
                    HEmpName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["负责人"].ToString());
                    HCentNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["工作中心代码"].ToString());
                    HCentName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["工作中心名称"].ToString());
                    HWorkTime = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["单班工时"].ToString());

                    //检查物料
                    int index = i + 1;

                    if (HORGNumber != "")
                    {


                        //查询组织
                        ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where  HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,组织不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();


                        //查询部门
                        ds = oCN.RunProcReturn("select * from Gy_Department where  HNumber='" + HDeptNum + "'  and HUSEORGID=" + HORGid + "", "Gy_Department");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,部门:" + HDeptName + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //查询负责人
                        ds = oCN.RunProcReturn("select * from Gy_Employee where  HNumber='" + HEmpNum + "' and HUSEORGID=" + HORGid + "", "Gy_Employee");

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,负责人:" + HEmpName + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //查询工作中心
                        ds = oCN.RunProcReturn("select * from Gy_WorkCenter where  HNumber='" + HCentNum + "' and HUSEORGID=" + HORGid + "", "Gy_WorkCenter"); //

                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,工作中心:" + HCentName + ",不存在！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HWorkCenterID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }

                        //单班工时
                        if (HWorkTime == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,单班工时不能为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        //生产资源名称
                        if (HSourceName == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,生产资源名称不能为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        //生产资源代码
                        if (HSourceNum == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,生产资源代码不能为空！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "第" + index + "行,组织代码为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = error;
                objJsonResult.data = tb2;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”Ÿäº§èµ„源 å¯¼å…¥(保存)
        [Route("Gy_Source/Gy_Source_btnSave")]
        [HttpPost]
        public object Gy_Source_btnSave([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

                foreach (JObject item in Excel)
                {
                    Dictionary<string, string> dic = new Dictionary<string, string>();
                    foreach (var itm in item.Properties())
                    {
                        dic.Add(itm.Name, itm.Value.ToString());
                    }
                    list.Add(dic);
                }

                oCN.BeginTran();
                int i = 1;
                foreach (Dictionary<string, string> item in list)
                {
                    string HDeptID = item["HDeptID"].ToString();//部门
                    string HEmpID = item["HEmpID"].ToString();//负责人
                    string HOrgID = item["HOrgID"].ToString();//组织ID
                    string HWorkCenterID = item["HWorkCenterID"].ToString();//工作中心
                    string HsouceName = item["生产资源名称"].ToString();
                    string HsouceNum = item["生产资源代码"].ToString();
                    string HWorkTime = item["单班工时"].ToString();
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(HsouceName);//短代码
                    if (sShortNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！短代码为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    int HEndFlag = 1;//末级标志
                    int HLevel = DBUtility.ClsPub.GetLevel(HsouceName); //等级


                    if (!DBUtility.ClsPub.AllowNumber(HsouceNum.Trim()))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HsouceNum + "'", "Gy_Source");

                    if (ds.Tables[0].Rows.Count == 0)
                    {

                        string sql = "insert into Gy_Source(HName,HNumber,HDeptID,HEmpID,HUSEORGID,HCenterID,HWorkTimes,HShortNumber,HEndFlag,HLevel,HHelpCode,HParentID,HStopflag,HRemark,HType)" +
                            $"values('{HsouceName}', '{HsouceNum}',{HDeptID}, {HEmpID}, '{HOrgID}', '{HWorkCenterID}', {HWorkTime},'{sShortNumber}',{HEndFlag},{HLevel},'',0,0,'','')";
                        oCN.RunProc(sql);
                    }
                    else
                    {
                        oCN.RunProc("    update  Gy_Source set HWorkTimes=" + HWorkTime + ",HDeptID="+ HDeptID + ",HEmpID="+ HEmpID + ",HCenterID="+HWorkCenterID+"  where HNumber='" + HsouceNum +"'");
                    }

                    i++;
                }

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "导入成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write(e);
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”Ÿäº§èµ„源 æ ‘形图
        public class TreeModel
        {

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs

@@ -1010,9 +1010,10 @@
            public int HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public bool HFinishFlag;
        }
        #endregion
        #region é¡¹ç›®é˜¶æ®µæ¸…单 æ–°å¢ž/编辑-保存
        #region ä»»åŠ¡æ±‡æŠ¥ æ–°å¢ž/编辑-保存
        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
@@ -1046,7 +1047,7 @@
            return objJsonResult;
        }
        #endregion
        #region æ·»åŠ  é¡¹ç›®é˜¶æ®µæ¸…单 ä¸»è¡¨
        #region æ·»åŠ  ä»»åŠ¡æ±‡æŠ¥ ä¸»è¡¨
        public json AddBillMain_WorkTaskReportBill(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1169,6 +1170,8 @@

                    oCN.RunProc(sql);

                    //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                    oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
                    //记录日志
@@ -1231,7 +1234,7 @@
            }
        }
        #endregion
        #region æ·»åŠ é¡¹ç›®é˜¶æ®µæ¸…单 å­è¡¨
        #region æ·»åŠ ä»»åŠ¡æ±‡æŠ¥ å­è¡¨
        public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
        {
            List<PM_WorkTaskReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_WorkTaskReportBill_Sub>>(msg3);
@@ -1255,10 +1258,10 @@
                int HSourceEntryID = oSub.HSourceEntryID;
                string HSourceBillNo = oSub.HSourceBillNo;
                string HSourceBillType = oSub.HSourceBillType;

                bool HFinishFlag = oSub.HFinishFlag;

                string sql = "insert into PM_WorkTaskReportBillSub" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
@@ -1277,10 +1280,14 @@
                    "," + HSourceEntryID +
                    ",'" + HSourceBillType +
                    "','" + HSourceBillNo +
                    "')";
                    "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
                    ")";

                oCN.RunProc(sql);
            }

            //回填工作任务单关联数量、单据状态
            oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());

            objJsonResult.code = "1";
            objJsonResult.count = 1;
@@ -1436,6 +1443,8 @@

                oCN.BeginTran();

                //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                oCN.RunProc("delete from PM_WorkTaskReportBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");

@@ -1443,7 +1452,7 @@

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }

 WebAPI/Web.config

@@ -22,7 +22,7 @@
        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <add key="sUrl" value="http://192.168.110.51/WEBS-WMS/WebService1.asmx"/><!--颜台式机-->
        <add key="sUrl" value="http://192.168.63.20/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://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -100,7 +100,7 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://192.168.110.51/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
            <endpoint address="http://192.168.63.20/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
     bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
     name="WebService1Soap" />
        </client>
@@ -109,7 +109,7 @@
 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://192.168.110.51/WEBS-WMS/WebService1.asmx</value>
    <value>http://192.168.63.20/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>