From 215aa5a1ca3c5cff826e8c0ee529a6ac6f380c36 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 26 十一月 2021 17:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/生产管理/Sc_ICMOReportBillList.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillList.cs" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillList.cs"
index 50851fb..ad1af32 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillList.cs"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using WarM;
using System.IO;
+using Pub_Class;
namespace WorkM
{
@@ -33,6 +34,8 @@
DAL.ClsSc_ICMOReportBill oBill = new DAL.ClsSc_ICMOReportBill();
public Sc_ICMOReportBill oFrm;
public string sDlgWhere = ""; //澶栫獥浣撻�掑叆
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ public string UpdateSourceInterID = ""; //瀹㈡埛瀹氬埗鍖栧悕绉版壂鐮佺敓鎴愮敓浜ф眹鎶ュ崟鏃舵槸鍚﹀洖濉搴旀潯鐮佹。妗堟潯鐮佹簮鍗曚俊鎭紙Y涓哄洖濉級
Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
#region 鍥哄畾浠ｇ爜
@@ -158,6 +161,19 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+
+ //鑾峰彇绯荤粺鍙傛暟
+ 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;
+ }
}
//鍙屽嚮鏌ョ湅
private void grdMain_DblClick(object sender, EventArgs e)
@@ -224,19 +240,16 @@
}
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
{
-
- if (!oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (!oBill.DeleteBillandWMS(oBill.omodel.HInterID, oBill.omodel.HBillNo, ERPMode, UpdateSourceInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
- MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず"); //澶辫触
return;
}
else
{
-
+ MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず"); //鎴愬姛
Display();
-
}
-
}
}
else
--
Gitblit v1.9.1