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

yusijie

2023-01-21 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3

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

 DAL/³µ¼ä¹ÜÀí/ClsSc_StationOutBill.cs

@@ -339,7 +339,7 @@
                ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
                ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
                ",HPersonNums,HMachineNums" +
                ",HPersonNums,HMachineNums,HEmpNum" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HMouldNum + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HSourceName + "'," + omodel.HPieceQty.ToString() + "," + omodel.HWasterQty.ToString() + "," + omodel.HPlanPieceQty.ToString() + "," + omodel.HBadPNL.ToString() +
@@ -349,7 +349,7 @@
                "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HBadCount.ToString() + "," + omodel.HCenterID.ToString() + "," + omodel.HProcNo.ToString() + ",'" + omodel.HOrderProcNO + "'" + ",'" + omodel.HSourceNameList + "'" +
                "," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
                "," + omodel.HEmpID2.ToString() + "," + omodel.HEmpID3.ToString() + "," + omodel.HEmpID4.ToString() + "," + omodel.HEmpID5.ToString() + "," + omodel.HDSQty.ToString() + "," + omodel.HChongQty.ToString() + "," + omodel.HPriceRate.ToString() + "," + omodel.HWorkTimes.ToString() + "," + omodel.HQCCheckID.ToString() +
                "," + omodel.HPersonNums.ToString() + "," + omodel.HMachineNums.ToString() +
                "," + omodel.HPersonNums.ToString() + "," + omodel.HMachineNums.ToString() + ",'" + omodel.HEmpNum.ToString() + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSc_StationOutBillSub oSub in DetailColl)

 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache

Binary files differ

 LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache

Binary files differ

 Model/³µ¼ä¹ÜÀí/ClsSc_StationOutBillMain.cs

@@ -63,6 +63,6 @@
        public string HSourceNameList;//设备清单
        public Int64 HPersonNums;       //人员数
        public Int64 HMachineNums;      //机器数

        public string HEmpNum; //职员代码
    }
}

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache

Binary files differ

 PayM/obj/Release/PayM.csproj.ResolveComReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs

@@ -301,6 +301,7 @@
                    ",HUpDater='" + HMaker + "'" +
                    ",HUpDateDate=getdate()" +
                    ",HInnerBillNo='" + HInnerBillNo + "'" +
                    ",HWWWorkOrderBillNo='" + HWWWorkOrderBillNo + "'" +
                    ",HSupID=" + HSupID +
                    ",HEmpID=" + HEmpID +
                    ",HQty=" + HQty +

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -437,6 +437,7 @@
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();

                List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
                
@@ -454,8 +455,8 @@
                    oBill.omodel.HBillNo = msg3 + "- " + j;
                    oBill.omodel.HBillStatus = 0;
                    oBill.omodel.HMouldNum = list[i].HMouldNum;
                    oBill.omodel.HYear = 2022;
                    oBill.omodel.HPeriod = 1;
                    oBill.omodel.HYear = DateTime.Now.Year;
                    oBill.omodel.HPeriod = DateTime.Now.Month;
                    oBill.omodel.HRemark = list[i].HRemark;
                    oBill.omodel.HSourceName = list[i].HSourceName;
                    oBill.omodel.HPieceQty = list[i].HPieceQty;
@@ -508,6 +509,7 @@
                    oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                    oBill.omodel.HQCCheckID = list[i].HQCCheckID;
                    oBill.omodel.HMaker = msg4;
                    oBill.omodel.HEmpNum = msg5;

                    //string HBillSubType = "3791";
                    //long HInterID = list[0].HInterID;//递入type得到的单据ID

 WebAPI/WebAPI.csproj

@@ -397,8 +397,6 @@
    <Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
    <Compile Include="Controllers\Pay_ReportController.cs" />
    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />