diff --git a/GZ_LTHPilot_ORDER.csproj b/GZ_LTHPilot_ORDER.csproj index 2a392ed..7fd9a09 100644 --- a/GZ_LTHPilot_ORDER.csproj +++ b/GZ_LTHPilot_ORDER.csproj @@ -177,11 +177,13 @@ + + diff --git a/PRD_PPBOM/AuditPOM.cs b/PRD_PPBOM/AuditPOM.cs index 44f2691..f194c39 100644 --- a/PRD_PPBOM/AuditPOM.cs +++ b/PRD_PPBOM/AuditPOM.cs @@ -51,6 +51,9 @@ namespace GZ_LTHPilot_ORDER.PRD_PPBOM SqlManage.SqlManage.UpdateFSTOCKID(this.Context, Convert.ToString(PPBOMFStockFName["FENTRYID"])); } } + //当物料为M开头，发料方式设置为调拨倒冲，倒冲时机设置为入库倒冲，拨出组织设置为珠海派诺，拨出组织为空， + //仓库设置为 : 68 + SqlManage.SqlManage.UpdatePRD_PPBOMLIkeM(this.Context, Convert.ToString(Billobj["Id"])); } } diff --git a/SAL_OUTSTOCK/AuditSal_Order.cs b/SAL_OUTSTOCK/AuditSal_Order.cs index 6d70940..dbb48c8 100644 --- a/SAL_OUTSTOCK/AuditSal_Order.cs +++ b/SAL_OUTSTOCK/AuditSal_Order.cs @@ -20,13 +20,13 @@ namespace GZ_LTHPilot_ORDER.SAL_OUTSTOCK { //获取单据信息 var Billobj = Row.DataEntity; - //根据销售出库单的FID，查询销售订单的FID和FentryId + //根据销售出库单的FID，查询销售订单的FentryId var Sal_OrderS = SqlManage.SqlManage.GetSal_ORderFEntryIdAndFid(this.Context, Convert.ToString(Billobj["ID"])); if (Sal_OrderS.Count != 0) { - //根据销售订单的FID和FENTRYID，计算新旧系统未出库数量=云星空剩余未出数量-K3已发货数量# + //根据销售订单的FENTRYID，计算新旧系统未出库数量=云星空剩余未出数量-K3已发货数量# foreach (var Sal_Order in Sal_OrderS) { - SqlManage.SqlManage.UpdateSal_OrderF_notoutQty(this.Context, Convert.ToString(Sal_Order["FID"]), + SqlManage.SqlManage.UpdateSal_OrderF_notoutQty(this.Context, Convert.ToString(Sal_Order["FENTRYID"])); } } diff --git a/SAL_RETURNSTOCK/AuditSal_Order.cs b/SAL_RETURNSTOCK/AuditSal_Order.cs index 0e231ac..e5a27c6 100644 --- a/SAL_RETURNSTOCK/AuditSal_Order.cs +++ b/SAL_RETURNSTOCK/AuditSal_Order.cs @@ -21,14 +21,14 @@ namespace GZ_LTHPilot_ORDER.SAL_RETURNSTOCK { //获取单据信息 var Billobj = Row.DataEntity; - //根据销售退货单的FID，查询销售订单的FID和FentryId + //根据销售退货单的FID，查询销售订单的FentryId var Sal_Orders = SqlManage.SqlManage.GETRETURNSTOCKSal_ORDERFidAndFentryid(this.Context, Convert.ToString(Billobj["ID"])); if (Sal_Orders.Count != 0) { foreach (var Sal_Order in Sal_Orders) { - SqlManage.SqlManage.UpdateSal_OrderF_notoutQty(this.Context, Convert.ToString(Sal_Order["FID"]), + SqlManage.SqlManage.UpdateSal_OrderF_notoutQty(this.Context, Convert.ToString(Sal_Order["FENTRYID"])); } } diff --git a/SQL/SqlManage.cs b/SQL/SqlManage.cs index 6bd0c15..0df8135 100644 --- a/SQL/SqlManage.cs +++ b/SQL/SqlManage.cs @@ -254,7 +254,7 @@ namespace GZ_LTHPilot_ORDER.SqlManage return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null) as DynamicObjectCollection; } - //根据销售出库单的FID，获取销售订单的FID和FENTRYID + //根据销售出库单的FID，获取销售订单的FENTRYID public static DynamicObjectCollection GetSal_ORderFEntryIdAndFid(Context ctx,string FID) { string sql = string.Format(@"/*dialect*/ @@ -265,21 +265,30 @@ namespace GZ_LTHPilot_ORDER.SqlManage } //根据销售出库单的FID，反写销售订单新旧系统未出库数量 - public static void UpdateSal_OrderF_notoutQty(Context ctx,string FID,string FENTRYID) + public static void UpdateSal_OrderF_notoutQty(Context ctx,string FENTRYID) { string sql = string.Format(@"/*dialect*/ - EXEC UpdateSAL_ORDERF_notoutQty '{0}','{1}' - ", FID,FENTRYID); + EXEC UpdateSAL_ORDERF_notoutQty '{0}' + ",FENTRYID); DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } - //根据销售退货单的FID，反写销售订单新旧系统未出库数量 + //根据销售退货单的FID，获取销售订单的FENTRYID public static DynamicObjectCollection GETRETURNSTOCKSal_ORDERFidAndFentryid(Context ctx,string FID) { - string sql = string.Format(@"/*dialect* + string sql = string.Format(@"/*dialect*/ EXEC GETRETURNSTOCKSal_ORDERFidAndFentryid_GZTH '{0}' - /",FID); + ",FID); return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null) as DynamicObjectCollection; } + /*当物料为M开头，发料方式设置为调拨倒冲，倒冲时机设置为入库倒冲，拨出组织设置为珠海派诺，拨出组织为空， + 仓库设置为 : 68*/ + public static void UpdatePRD_PPBOMLIkeM(Context ctx,string FID) + { + string sql = string.Format(@"/*dialect*/ + EXEC UpdatePRD_PPBOMLIkeM_GZTH '{0}' + ",FID); + DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); + } } } diff --git a/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同 -含施工-2024-5-24.docx b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同 -含施工-2024-5-24.docx new file mode 100644 index 0000000..ae3ddea Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同 -含施工-2024-5-24.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同-不含施工，含调试费-2024-9-2.docx b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同-不含施工，含调试费-2024-9-2.docx new file mode 100644 index 0000000..4b4e093 Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CS】兴诺-A充电桩-系统购销合同-不含施工，含调试费-2024-9-2.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx new file mode 100644 index 0000000..b50adc0 Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】技术 -合同模版.docx b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】技术 -合同模版.docx new file mode 100644 index 0000000..be886ff Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【CW】技术 -合同模版.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【C】兴诺-A充电桩项目购销合同模板-2024-6-25.docx b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【C】兴诺-A充电桩项目购销合同模板-2024-6-25.docx new file mode 100644 index 0000000..790dd4e Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺合同模版【新】/【C】兴诺-A充电桩项目购销合同模板-2024-6-25.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（不含施工）.docx b/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（不含施工）.docx new file mode 100644 index 0000000..e64df47 Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（不含施工）.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（含施工）.docx b/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（含施工）.docx new file mode 100644 index 0000000..344955c Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺模板/CS合同（含施工）.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺模板/C合同.docx b/兴诺模板/兴诺合同模版【新】/兴诺模板/C合同.docx new file mode 100644 index 0000000..2d90c88 Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺模板/C合同.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx b/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx new file mode 100644 index 0000000..34f824c Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】充电桩维保服务合同-（按服务事件报价）-2024-4-11.docx differ diff --git a/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】技术 -合同模版.docx b/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】技术 -合同模版.docx new file mode 100644 index 0000000..24af41a Binary files /dev/null and b/兴诺模板/兴诺合同模版【新】/兴诺模板/【CW】技术 -合同模版.docx differ