SRM-MES.git - Gitblit

parent: 56c3c9f9 | 补丁 | 提交 | ignore whitespace

yusijie

2024-01-02 5680aeacdd7e941e1035fc42d226a9a392dc1938

生成送货单时新增字段，

5个文件已修改

	DAL/采购管理/ClsCg_POInStockBill.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/WMS/ClsGy_MaterialList_WMS_Model.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/采购管理/ClsCg_POInStockBillMain.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/采购管理/ClsCg_POInStockBillSub.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DAL/²É¹º¹ÜÀí/ClsCg_POInStockBill.cs

@@ -141,18 +141,21 @@
                //è¥MAINDIéå¤åéæ°è·å
                oCn.BeginTran();
                //ä¸»è¡¨
                //å¯è´å¥ç¹: HExpressSupplier,HReceiveGoodsMan,HReceiveGoodsLink
                oCn.RunProc("Insert Into Cg_POInStockBillMain     " +
                        "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                        ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                        ",HAddress,HSupID,HCurID,HWHID,HExRate,HDHDate" +
                        ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID,HMainSourceInterID" +
                        ",HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate) " +
                        ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID" +
                        ",HMainSourceInterID,HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate,HExpressSupplier,HReceiveGoodsMan"+
                        ",HReceiveGoodsLink,HSendGoodsAddr,HSendGoodsMan,HSendGoodsLink,HPURCHASEORGID) " +
                        " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                        ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                        ",'" + omodel.HAddress + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HDHDate + "'" +
                        ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HDeliveryNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID +
                        "," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "') ");
                //æå¥åè¡¨        
                        "," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "','" + omodel.HExpressSupplier + "','" + omodel.HReceiveGoodsMan + "','" + omodel.HReceiveGoodsLink + "','" + omodel.HSendGoodsAddr + "','" + omodel.HSendGoodsMan + "','" + omodel.HSendGoodsLink + "'," + omodel.HPURCHASEORGID + ") ");
                //æå¥åè¡¨
                //å¯è´å¥ç¹ HSupBatchNoï¼HSupMaterNumber
                foreach (Model.ClsCg_POInStockBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Cg_POInStockBillSub " +
@@ -164,7 +167,7 @@
                      ",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
                      ",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
                      ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD,HExpressNumberSub" +
                      ",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber) values("//
                      ",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber,HSupBatchNo,HSupMaterNumber,HTAXPRICE_T) values("//
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                      ",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
                      "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
@@ -172,7 +175,8 @@
                      "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
                      "," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
                      "," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() +  "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "'" + ") ");//ç©æµåå·ä¸ºçä¸çªä½¿ç¨ 
                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() +  "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "','" + oSub.HSupBatchNo + 
                      "','" + oSub.HSupMaterNumber + "'," + oSub.HTAXPRICE_T + ") ");//ç©æµåå·ä¸ºçä¸çªä½¿ç¨ 
                }
                //åå¡«å³èæ°é
                //oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString());

 Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs

@@ -33,5 +33,8 @@
        public string HKFDate;              //çäº§æ¥æ
        public Int64 HKFPeriod;            //ä¿è´¨æ
        public string HKFDQDate;            //å°ææ¥æ
        public string HSupBatchNo;            //ä¾åºåæ¹æ¬¡ï¼å¯è´ï¼
        public string HSupMaterNumber;            //ä¾åºåæå· ï¼å¯è´ï¼
        public Int64 HISKFPERIOD;            //æ¯å¦å¯ç¨ä¿è´¨æ
    }
}

 Model/WMS/ClsGy_MaterialList_WMS_Model.cs

@@ -39,7 +39,9 @@
        public string HKFDate;              //çäº§æ¥æ
        public Int64 HKFPeriod;            //ä¿è´¨æ
        public string HKFDQDate;            //å°ææ¥æ

        public string HSupBatchNo; //ä¾åºåæ¹æ¬¡
        public string HSupMaterNumber; //ä¾åºåæå·
        public Int64 HISKFPERIOD; //æ¯å¦å¯ç¨ä¿è´¨æ

    }
}

 Model/²É¹º¹ÜÀí/ClsCg_POInStockBillMain.cs

@@ -20,5 +20,14 @@
        public string HDHDate; //å°è´§æ¥æ
        public string HDeliveryNo; //ç©æµåå·

        public string HExpressSupplier; //ç©æµå¬å¸
        public string HReceiveGoodsMan; //æ¶è´§äºº
        public string HReceiveGoodsLink; //æ¶è´§äººèç³»æ¹å¼

        public string HSendGoodsAddr; //éè´§å°å
        public string HSendGoodsMan; //éè´§äºº
        public string HSendGoodsLink; //éè´§äººèç³»æ¹å¼

        public Int64 HPURCHASEORGID; //éè´ç»ç»
    }
}

 Model/²É¹º¹ÜÀí/ClsCg_POInStockBillSub.cs

@@ -50,5 +50,8 @@
        public string HExpressSupplierSub; //ç©æµå¬å¸
        public string HPlanArrivalDate; //å°è´§æ¥æ
        public string HBoxNumber; //ç®±å·
        public string HSupBatchNo; //ä¾åºåæ¹æ¬¡
        public string HSupMaterNumber; //ä¾åºåæå·
        public double HTAXPRICE_T; // ï¼å¯è´ï¼å«ç¨ééåä»·/å¨
    }
}

			@@ -141,18 +141,21 @@
			//è¥MAINDIéå¤åéæ°è·å
			oCn.BeginTran();
			//ä¸»è¡¨
			//å¯è´å¥ç¹: HExpressSupplier,HReceiveGoodsMan,HReceiveGoodsLink
			oCn.RunProc("Insert Into Cg_POInStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HAddress,HSupID,HCurID,HWHID,HExRate,HDHDate" +
			",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID,HMainSourceInterID" +
			",HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate) " +
			",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID" +
			",HMainSourceInterID,HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate,HExpressSupplier,HReceiveGoodsMan"+
			",HReceiveGoodsLink,HSendGoodsAddr,HSendGoodsMan,HSendGoodsLink,HPURCHASEORGID) " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
			",'" + omodel.HAddress + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HDHDate + "'" +
			", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HDeliveryNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID +
			"," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "') ");
			//æå¥åè¡¨
			"," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "','" + omodel.HExpressSupplier + "','" + omodel.HReceiveGoodsMan + "','" + omodel.HReceiveGoodsLink + "','" + omodel.HSendGoodsAddr + "','" + omodel.HSendGoodsMan + "','" + omodel.HSendGoodsLink + "'," + omodel.HPURCHASEORGID + ") ");
			//æå¥åè¡¨
			//å¯è´å¥ç¹ HSupBatchNoï¼HSupMaterNumber
			foreach (Model.ClsCg_POInStockBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Cg_POInStockBillSub " +
			@@ -164,7 +167,7 @@
			",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
			",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
			",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD,HExpressNumberSub" +
			",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber) values("//
			",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber,HSupBatchNo,HSupMaterNumber,HTAXPRICE_T) values("//
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
			",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
			"," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
			@@ -172,7 +175,8 @@
			"'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
			"," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
			"," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
			"'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "'" + ") ");//ç©æµåå·ä¸ºçä¸çªä½¿ç¨
			"'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "','" + oSub.HSupBatchNo +
			"','" + oSub.HSupMaterNumber + "'," + oSub.HTAXPRICE_T + ") ");//ç©æµåå·ä¸ºçä¸çªä½¿ç¨
			}
			//åå¡«å³èæ°é
			//oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString());

			@@ -33,5 +33,8 @@
			public string HKFDate; //çäº§æ¥æ
			public Int64 HKFPeriod; //ä¿è´¨æ
			public string HKFDQDate; //å°ææ¥æ
			public string HSupBatchNo; //ä¾åºåæ¹æ¬¡ï¼å¯è´ï¼
			public string HSupMaterNumber; //ä¾åºåæå· ï¼å¯è´ï¼
			public Int64 HISKFPERIOD; //æ¯å¦å¯ç¨ä¿è´¨æ
			}
			}

			@@ -39,7 +39,9 @@
			public string HKFDate; //çäº§æ¥æ
			public Int64 HKFPeriod; //ä¿è´¨æ
			public string HKFDQDate; //å°ææ¥æ

			public string HSupBatchNo; //ä¾åºåæ¹æ¬¡
			public string HSupMaterNumber; //ä¾åºåæå·
			public Int64 HISKFPERIOD; //æ¯å¦å¯ç¨ä¿è´¨æ

			}
			}

			@@ -20,5 +20,14 @@
			public string HDHDate; //å°è´§æ¥æ
			public string HDeliveryNo; //ç©æµåå·

			public string HExpressSupplier; //ç©æµå¬å¸
			public string HReceiveGoodsMan; //æ¶è´§äºº
			public string HReceiveGoodsLink; //æ¶è´§äººèç³»æ¹å¼

			public string HSendGoodsAddr; //éè´§å°å
			public string HSendGoodsMan; //éè´§äºº
			public string HSendGoodsLink; //éè´§äººèç³»æ¹å¼

			public Int64 HPURCHASEORGID; //éè´ç»ç»
			}
			}

			@@ -50,5 +50,8 @@
			public string HExpressSupplierSub; //ç©æµå¬å¸
			public string HPlanArrivalDate; //å°è´§æ¥æ
			public string HBoxNumber; //ç®±å·
			public string HSupBatchNo; //ä¾åºåæ¹æ¬¡
			public string HSupMaterNumber; //ä¾åºåæå·
			public double HTAXPRICE_T; // ï¼å¯è´ï¼å«ç¨ééåä»·/å¨
			}
			}