From ed65f00c01e31f2ba9ad7f681fea08a332120c06 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 07 十二月 2022 11:08:20 +0800
Subject: [PATCH] 单据（调拨申请单，发货通知单，出库申请单）；报表（奥邦/车间报表）
---
WorkM/生产管理/Sc_ICMOReportBill.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBill.cs" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBill.cs"
index 70e5785..f833098 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBill.cs"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBill.cs"
@@ -64,6 +64,8 @@
public const string ModRightNameMoney= ModRightName + "_Money";
public const string ModRightNameQty = ModRightName + "_Qty";
public bool BillChange; //鍗曟嵁淇敼鐘舵��
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ public string UpdateSourceInterID = ""; //瀹㈡埛瀹氬埗鍖栧悕绉版壂鐮佺敓鎴愮敓浜ф眹鎶ュ崟鏃舵槸鍚﹀洖濉搴旀潯鐮佹。妗堟潯鐮佹簮鍗曚俊鎭紙Y涓哄洖濉級
//
public DBUtility.ClsPub.Enum_BillStatus BillStatus; //鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
public Int64 KeyID; //鍗曟嵁涓诲唴鐮�
@@ -157,13 +159,16 @@
//
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
- if (BillOld.DeleteBill(BillOld.omodel.HInterID, ref ClsPub.sExeReturnInfo) != true)
+ if (!BillOld.DeleteBillandWMS(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, ERPMode, UpdateSourceInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
BillChange = true;
- MessageBox.Show("鍒犻櫎澶辫触,鍘熷洜:" + ClsPub.sExeReturnInfo, "鎻愮ず");
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず"); //澶辫触
return;
}
- MessageBox.Show("鍒犻櫎鎴愬姛", "鎻愮ず");
+ else
+ {
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず"); //鎴愬姛
+ }
BillOld = new DAL.ClsSc_ICMOReportBill();
this.Sub_Next(); //鏄剧ず涓嬩竴寮犲崟鎹�
if (BillOld.omodel.HInterID == 0)//鑻ユ壘涓嶅埌涓嬩竴寮狅紝鍒欐樉绀轰笂涓�寮�
@@ -267,6 +272,19 @@
oSumGrid.oGridsum = grdSum;
this.Text = ModCaption; //鍛藉悕绐椾綋鏍囬
this.lblCaption.Text = ModCaption;//鍛藉悕鍗曟嵁鏍囬
+
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
+ UpdateSourceInterID = oSystemParameter.omodel.Sc_ICMOReportBill_UpdateSourceInterID;
+ }
}
//棣栧紶
--
Gitblit v1.9.1