yusijie
2023-08-31 df41701bd6f2e21d768f4a4a8e71626e3ca83d0f
巡检单
5个文件已修改
2个文件已添加
150 ■■■■■ 已修改文件
Model/Model.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_PatrolProcCheckBillSub_BadReason.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_ManagementController.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckBillController.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj
@@ -585,6 +585,7 @@
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillSub.cs" />
    <Compile Include="质检管理\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
    <Compile Include="质检管理\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
    <Compile Include="质检管理\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillMain.cs" />
    <Compile Include="车间管理\ClsSc_ProcExchRecordBackBillSub.cs" />
Model/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckBillSub_BadReason.cs
New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsQC_PatrolProcCheckBillSub_BadReason : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HInterID;
        public string HBillNo_bak;
        public Int64 HEntryID;
        public Int64 HItemID;
        public Int64 HSEQ;
        public DateTime HCreateDate;
        public Int64 HBadReasonID;
        public Int64 HEmpID  ;
        public Int64 HProcID  ;
        public Int64 HCheckEmpID;
        public DateTime HFinishDate;
        public Int64 HMaterID ;
        public double HQty;
    }
}
WebAPI/Controllers/QC_ManagementController.cs
@@ -1223,6 +1223,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string user = sArray[2].ToString();
            string badmsg = sArray[3].ToString();
            string UserName = "";
@@ -1301,10 +1302,34 @@
                    oItemSub.HRelationQty = 0;
                    oItemSub.HRelationMoney = 0;
                    oItemSub.HCloseMan = "";
                    oItemSub.HRemark = "";
                    //oItemSub.HRemark = "";
                    oBill.DetailColl.Add(oItemSub);
                }
                badmsg = badmsg.Substring(1, badmsg.Length - 2);
                badmsg = badmsg.Replace("\\", "");
                badmsg = badmsg.Replace("\n", "");  //\n
                List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> bs = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
                bs = oListModels.getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(badmsg);
                int j = 0;
                foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason badSub in bs)
                {
                    badSub.HBillNo_bak = oBill.omodel.HBillNo;//单据号(备份,以免内码丢失,找不到对应主表)
                    j++;
                    if (string.IsNullOrWhiteSpace(badSub.HBillNo_bak))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没备份单据号,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    badSub.HInterID = oBill.omodel.HInterID;
                    badSub.HEntryID = j;
                    badSub.HSEQ = j;
                    oBill.DetailColl_Bad.Add(badSub);
                }
                //保存
                //保存完毕后处理
                bool bResult;
WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckBillController.cs
New file
@@ -0,0 +1,26 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class QC_PatrolProcCheckBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
    }
}
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -9,11 +9,12 @@
    {
        public Model.ClsQC_PatrolProcCheckBillMain omodel = new Model.ClsQC_PatrolProcCheckBillMain();
        public List<Model.ClsQC_PatrolProcCheckBillSub> DetailColl = new List<Model.ClsQC_PatrolProcCheckBillSub>();
        public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> DetailColl_Bad = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
        //public List<Model.ClsQC_PatrolProcCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_PatrolProcCheckBillSub_Item>();
        public ClsQC_PatrolProcCheckBill()
        {
            base.MvarItemKeySub = "QC_PatrolProcCheckBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub2 = "QC_PatrolProcCheckBillSub_BadReason";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="QC_PatrolProcCheckBillMain";
@@ -59,20 +60,21 @@
                //",HCloseType="+omodel.HCloseType.ToString()+
                //",HDeleteMan='" + omodel.HDeleteMan + "'" +
                //",HDeleteDate='" + omodel.HDeleteDate + "'" +
                ",HPrintQty=" + omodel.HPrintQty.ToString() +
                //",HPrintQty=" + omodel.HPrintQty.ToString() +
                //========================================
                //",HSupID=" + omodel.HSupID.ToString() +
                //",HEmpID=" + omodel.HEmpID.ToString() +
                ",HSourceID=" + omodel.HSourceID.ToString() +
                ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
                ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
                ",HICMOQty=" + omodel.HICMOQty.ToString() +
                ",HProcExchInterID=" + omodel.HICMOQty.ToString() +
                ",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
                ",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
                ",HProcExchQty=" + omodel.HICMOQty.ToString() +
                ",HMaterID=" + omodel.HMaterID.ToString() +
                //",HSourceID=" + omodel.HSourceID.ToString() +
                //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
                //",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
                //",HICMOQty=" + omodel.HICMOQty.ToString() +
                //",HProcExchInterID=" + omodel.HICMOQty.ToString() +
                //",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
                //",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
                //",HProcExchQty=" + omodel.HICMOQty.ToString() +
                //",HMaterID=" + omodel.HMaterID.ToString() +
                ",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
                ",HMainProcID=" + omodel.HMainProcID.ToString() +
                " where HInterID=" + lngBillKey.ToString();
                //更新主表
                oCn.RunProc(sqlerro);
@@ -80,8 +82,11 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //删除子表2
                DeleteBillSub2(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                //插入子表
                foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into QC_PatrolProcCheckBillSub " +
@@ -89,14 +94,28 @@
                      ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
                      ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
                      ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10"+
                      ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3+ "','" + oSub.HQCNote4+ "'" +
                      ",'" + oSub.HQCNote5+ "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
                      "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
                      ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
                      ") ");
                }
                //插入子表2
                foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
                {
                    oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
                      " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
                      ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
                      ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
                      + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
                      + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
                      + ") ");
                }
                //foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
                //{
@@ -174,6 +193,19 @@
                      ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
                      ") ");
                }
                //插入子表2
                foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
                {
                    oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
                      " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
                      ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
                      ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
                      + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
                      + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
                      + ") ");
                }
                //foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
                //{
                //    oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_Item " +
WebAPI/ListModels.cs
@@ -492,6 +492,17 @@
            return list;
        }
        /// <summary>
        /// å¤„理新增巡检单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具维修主表的json
WebAPI/WebAPI.csproj
@@ -482,6 +482,7 @@
    <Compile Include="Controllers\博日自动扫码线\ScanlineAPIController.cs" />
    <Compile Include="Controllers\品质管理\产线质检平台\Sc_ICMOBillQualityStatus_TmpController.cs" />
    <Compile Include="Controllers\品质管理\产线返修平台\Sc_SourceLineRepairBillController.cs" />
    <Compile Include="Controllers\品质管理\巡检单\QC_PatrolProcCheckBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_COMMONCONTACTBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_CustLocationController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_DutyBillController.cs" />
@@ -1001,6 +1002,7 @@
    <Folder Include="Views\ProductionPlanReport\" />
    <Folder Include="Views\ProductionReturnBill\" />
    <Folder Include="Views\QC_Management\" />
    <Folder Include="Views\QC_PatrolProcCheckBill\" />
    <Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
    <Folder Include="Views\Sb_EquipSparepartsBill\" />
    <Folder Include="Views\Sb_EquipSparepartsChangeBill\" />