MES-WEB-API.git

parent: 8e554500 | 补丁 | 提交 | ignore whitespace

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

chenhaozhe

2026-01-29 34bbb4f8f79bb07d7b15f68d63a6faf50b726b00

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

4个文件已修改

	DAL/基础资料/公用基础资料/ClsCg_ContractTransportBillList.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/基础资料/基础资料/ClsCg_ContractTransportBillMain.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/Cg_ContractTransportBillListController.cs	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DAL/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/ClsCg_ContractTransportBillList.cs

@@ -61,10 +61,11 @@
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                //",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + omodel.HMaker + "'" +
                ",HExRate='" + omodel.HExRate + "'" +
                ",HUpDateDate=getdate()" +
                //========================================

                ",HContractDate ='" + omodel.HContractDate.ToString() +"',"+ "HSupID = "+ omodel.HSupID.ToString()+","+ "HContractNumber='"+ omodel.HContractNumber.ToString()+"',"+ "HContractName='"+ omodel.HContractName.ToString() + "',"+
                ",HContractDate ='" + DateTime.Now.ToString() +"',"+ "HSupID = "+ omodel.HSupID.ToString()+","+ "HContractNumber='"+ omodel.HContractNumber.ToString()+"',"+ "HContractName='"+ omodel.HContractName.ToString() + "',"+
                "HAddress='"+ omodel.HAddress.ToString() + "',"+ "HSSID="+ omodel.HSSID.ToString() + "," + "HCurID=" + omodel.HCurID.ToString() + "," + "HEmpID=" + omodel.HEmpID.ToString() + "," + "HDeptID=" + omodel.HDeptID.ToString() + ""+
                 // ",HExplanation ='" + omodel.HExplanation.ToString() +"'"+ ",HInnerBillNo ='" + omodel.HInnerBillNo.ToString() + "'"+
                 
@@ -169,7 +170,7 @@
                //ä¸»è¡¨
                string mainSql = "insert into Cg_ContractTransportBillMain" +
                    "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
                    ",HContractDate,HSupID,HContractNumber,HContractName,HAddress,HSSID,HCurID,HEmpID,HDeptID,HExplanation,HInnerBillNo) " +
                    ",HContractDate,HSupID,HContractNumber,HContractName,HAddress,HSSID,HCurID,HEmpID,HDeptID,HExplanation,HExRate,HInnerBillNo) " +
                    "values(" +
                    "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
                    "," + omodel.HPeriod.ToString() +
@@ -191,6 +192,7 @@
                    "','" + omodel.HEmpID +
                    "','" + omodel.HDeptID +
                    "','" + omodel.HExplanation +
                    "','" + omodel.HExRate +
                    "','" + omodel.HInnerBillNo +
                    "')";


 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsCg_ContractTransportBillMain.cs

@@ -18,5 +18,6 @@
        public int HDeptID;
        public string HExplanation;
        public string HInnerBillNo;
        public string HExRate;
    }
}

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -412,7 +412,7 @@
                    oCN.RunProc("Insert Into Sc_StationOutBillMain " +
                    "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
                    ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
                    ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                    ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                    ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
                    ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
                    ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
@@ -423,7 +423,7 @@
                    ") " +
                    " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType)  + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",'"+ HDate + "','" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                    "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
                    "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
                    "," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
                    ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
                    "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
                    "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +

 WebAPI/Controllers/Cg_ContractTransportBillListController.cs

@@ -90,6 +90,7 @@
        {
            try
            {
                string s = "";
                //æ¥çæé
                if (!DBUtility.ClsPub.Security_Log("Cg_ContractTransportBill_Delete", 1, false, user))
                {
@@ -115,7 +116,7 @@
                if (BillOld.ShowBill(Int64.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    //å é¤åæ§å¶=========================================      
                    string sql1 = "exec h_p_Cg_ContractTransportBill_BeforeDelCtrl  " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                    string sql1 = "exec h_p_Cg_ContractTransportBill_BeforeDelCtrl  " + BillOld.omodel.HInterID + ",'" + user + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Cg_ContractTransportBill_BeforeDelCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
@@ -135,38 +136,51 @@
                        return objJsonResult;
                    }
                    //==================================================================================  

                    oCN.RunProc("delete from Cg_ContractTransportBillMain where HInterID = " + HInterID);
                    oCN.RunProc("delete from Cg_ContractTransportBillSub where HInterID= " + HInterID);
                    //å é¤åæ®ï¼åå«å é¤åæ§å¶ãåå¥æ¥å¿ï¼
                    if (!BillOld.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Cg_ContractTransportBill_AfterDelCtrl", user, ref ClsPub.sExeReturnInfo))
                    //å é¤åæ§å¶==================================================================================      
                    string sql2 = "exec h_p_Cg_ContractTransportBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                    ds = oCN.RunProcReturn(sql2, "h_p_Cg_ContractTransportBill_AfterDelCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "å é¤å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        s = "å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "å é¤æåï¼";
                        objJsonResult.Message = "å é¤å¤±è´¥!åå :" + s;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        s = ds.Tables[0].Rows[0]["HRemark"].ToString();
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "å é¤å¤±è´¥!åå :" + s;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==============================================================================================

                    oCN.Commit();

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "å é¤æå";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.Commit();


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucessï¼";
                objJsonResult.Message = "å é¤æå";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exceptionï¼" + e.ToString();
@@ -342,12 +356,12 @@
                //ä¿å
                //ä¿åå®æ¯åå¤ç
                bool bResult;
                if (refSav == "Add")
                if (refSav == "Add"|| refSav=="1")
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if (refSav == "Update")
                else if (refSav == "Update" || refSav == "3")
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }

			@@ -61,10 +61,11 @@
			",HPeriod='" + omodel.HPeriod.ToString() + "'" +
			//",HRemark='" + omodel.HRemark + "'" +
			",HUpDater='" + omodel.HMaker + "'" +
			",HExRate='" + omodel.HExRate + "'" +
			",HUpDateDate=getdate()" +
			//========================================

			",HContractDate ='" + omodel.HContractDate.ToString() +"',"+ "HSupID = "+ omodel.HSupID.ToString()+","+ "HContractNumber='"+ omodel.HContractNumber.ToString()+"',"+ "HContractName='"+ omodel.HContractName.ToString() + "',"+
			",HContractDate ='" + DateTime.Now.ToString() +"',"+ "HSupID = "+ omodel.HSupID.ToString()+","+ "HContractNumber='"+ omodel.HContractNumber.ToString()+"',"+ "HContractName='"+ omodel.HContractName.ToString() + "',"+
			"HAddress='"+ omodel.HAddress.ToString() + "',"+ "HSSID="+ omodel.HSSID.ToString() + "," + "HCurID=" + omodel.HCurID.ToString() + "," + "HEmpID=" + omodel.HEmpID.ToString() + "," + "HDeptID=" + omodel.HDeptID.ToString() + ""+
			// ",HExplanation ='" + omodel.HExplanation.ToString() +"'"+ ",HInnerBillNo ='" + omodel.HInnerBillNo.ToString() + "'"+

			@@ -169,7 +170,7 @@
			//ä¸»è¡¨
			string mainSql = "insert into Cg_ContractTransportBillMain" +
			"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
			",HContractDate,HSupID,HContractNumber,HContractName,HAddress,HSSID,HCurID,HEmpID,HDeptID,HExplanation,HInnerBillNo) " +
			",HContractDate,HSupID,HContractNumber,HContractName,HAddress,HSSID,HCurID,HEmpID,HDeptID,HExplanation,HExRate,HInnerBillNo) " +
			"values(" +
			"" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
			"," + omodel.HPeriod.ToString() +
			@@ -191,6 +192,7 @@
			"','" + omodel.HEmpID +
			"','" + omodel.HDeptID +
			"','" + omodel.HExplanation +
			"','" + omodel.HExRate +
			"','" + omodel.HInnerBillNo +
			"')";

			@@ -18,5 +18,6 @@
			public int HDeptID;
			public string HExplanation;
			public string HInnerBillNo;
			public string HExRate;
			}
			}

			@@ -412,7 +412,7 @@
			oCN.RunProc("Insert Into Sc_StationOutBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
			",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
			",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
			",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
			",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
			@@ -423,7 +423,7 @@
			") " +
			" values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",'"+ HDate + "','" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			"," + HICMOInterID + "," + HICMOEntryID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +

			@@ -90,6 +90,7 @@
			{
			try
			{
			string s = "";
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Cg_ContractTransportBill_Delete", 1, false, user))
			{
			@@ -115,7 +116,7 @@
			if (BillOld.ShowBill(Int64.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo))
			{
			//å é¤åæ§å¶=========================================
			string sql1 = "exec h_p_Cg_ContractTransportBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			string sql1 = "exec h_p_Cg_ContractTransportBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_Cg_ContractTransportBill_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -135,38 +136,51 @@
			return objJsonResult;
			}
			//==================================================================================

			oCN.RunProc("delete from Cg_ContractTransportBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from Cg_ContractTransportBillSub where HInterID= " + HInterID);
			//å é¤åæ®ï¼åå«å é¤åæ§å¶ãåå¥æ¥å¿ï¼
			if (!BillOld.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Cg_ContractTransportBill_AfterDelCtrl", user, ref ClsPub.sExeReturnInfo))
			//å é¤åæ§å¶==================================================================================
			string sql2 = "exec h_p_Cg_ContractTransportBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_Cg_ContractTransportBill_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			s = "å é¤åå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + s;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			s = ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤å¤±è´¥!åå :" + s;
			objJsonResult.data = null;
			oCN.RollBack();
			return objJsonResult;
			}
			//==============================================================================================

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}

			oCN.Commit();


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			@@ -342,12 +356,12 @@
			//ä¿å
			//ä¿åå®æ¯åå¤ç
			bool bResult;
			if (refSav == "Add")
			if (refSav == "Add"\|\| refSav=="1")
			{

			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else if (refSav == "Update")
			else if (refSav == "Update" \|\| refSav == "3")
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}