From 55264573b2b37e5fbd96061d2c5254a1cf2bbb5e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 九月 2023 13:14:42 +0800
Subject: [PATCH] 1
---
WarM/条码打印/Kf_WeighToBarCode.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index cbb25c7..9be67cd 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -363,6 +363,8 @@
+ ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ") ");
//鏇存柊鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_Sc_UpDateRelation_ICMOToProductIn_Add " + HInterID.ToString());
+ //鍥炲～宸茬敓鍗曠姸鎬�
+ oCn.RunProc("Update KF_WeighSource_Temp set HRelationInterID=1 where HInterID= " + HInterID.ToString());
MessageBox.Show("鐢熸垚鐢熶骇鍏ュ簱鍗曪細" + HBillNo + " 鎴愬姛锛�", "鎻愮ず");
oCn.Commit();
return true;
@@ -521,6 +523,17 @@
//鏉＄爜鐢熸垚鍓嶅垽鏂�
private bool Sub_AllowSave()
{
+ //鍒ゆ柇褰撳墠鍗曟嵁ID鏄惁宸蹭笂浼犵敓鎴愬崟鎹�
+ DataSet Ds = oCn.RunProcReturn("select top 1 1 from KF_WeighSource_Temp with(nolock) where HInterID=" + HInterID.ToString() + " and HRelationInterID=1 ", "KF_WeighSource_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ MessageBox.Show("褰撳墠鏉＄爜璁板綍宸叉崲鐝笂浼犵敓鎴愬崟鎹紝璇烽��鍑哄悗閲嶆柊杩涘叆璇ユā鍧楄繘琛屾潯鐮佺敓鎴愭搷浣滐紒", "鎻愮ず");
+ return false;
+ }
+
if (HInterID==0 || HBillNo=="")
{
MessageBox.Show("鑾峰彇鏉＄爜瀵瑰簲鍗曟嵁ID鎴栧崟鎹彿澶辫触锛岃閲嶆柊鍒锋柊鐣岄潰锛�", "鎻愮ず");
@@ -534,6 +547,11 @@
else if (DBUtility.ClsPub.isDoule( txtHWeightQyt.Text) == 0)
{
MessageBox.Show("璇疯緭鍏ユ纭噸閲忥紒", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isDoule(txtHQty.Text)- DBUtility.ClsPub.isDoule(txtHKDQty.Text) <= 0)
+ {
+ MessageBox.Show("杈撳叆鐨勬墸鐐规暟涓嶈兘澶т簬绫虫暟锛�", "鎻愮ず");
return false;
}
else if (DBUtility.ClsPub.isInt(txtHBarcodeNo.Text) == 0)
@@ -626,9 +644,10 @@
string HBarCode = "";
string HBarCodeType = "";
- double HQty = 0; //绫虫暟
+ double HNowQty = 0; //绫虫暟
double HMaterialJQty = 0; //閲嶉噺
double HMaterialMQty = 0; //鎵ｇ偣鏁�
+ double HQty = 0; //鏁伴噺
Int64 HDeptID = 0;
string HRemark = "";
string HMaterName = "";
@@ -641,9 +660,10 @@
HBarCode = TM;
HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
- HQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
+ HNowQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
HMaterialJQty = DBUtility.ClsPub.isDoule(txtHWeightQyt.Text);
HMaterialMQty = DBUtility.ClsPub.isDoule(txtHKDQty.Text);
+ HQty = HNowQty- HMaterialMQty;
HDeptID = DBUtility.ClsPub.isLong(txtHDeptName.Tag);
HRemark = DBUtility.ClsPub.isStrNull(txtHRemark.Text);
HMaterName = DBUtility.ClsPub.isStrNull(txtHMaterName.Text);
@@ -657,31 +677,31 @@
try
{
oCn.BeginTran();
- //鍐欏叆鏉＄爜妗ｆ (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁
+ //鍐欏叆鏉＄爜妗ｆ (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁锛屼笉鑹師鍥營D瀛樺叆HCustomQty1瀛楁锛�
oCn.RunProc("Insert into Gy_BarCodeBill " +
"(HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
- ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
") Values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + HMaker + "',getdate(),0," + HQty.ToString()
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "',''"
+ ", 1," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
- + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString()
+ + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + "," + HNowQty.ToString()
+ ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
+ ", " + ProcessExchangeInterID.ToString() + ",0,'" + ProcessExchangeBillNo + "'," + HBadReasonID.ToString() + ",'" + HCusMaterName + "','" + HCusModel + "'"
- + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','')");
+ + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1')");
//鍥炲～鏈�澶ф祦姘村彿
oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
//鍥炲～婧愬崟涓存椂琛℉InterID
- oCn.RunProc("update a set a.HInterID=" + HInterID.ToString() + ",a.HBillNo='" + HBillNo + "' from KF_WeighSource_Temp a where a.HInterID<>" + HInterID.ToString() + " and a.HMaker='" + HMaker + "' and convert(varchar(10),a.HMakeDate,120)=convert(varchar(10),getdate(),120)");
+ oCn.RunProc("update a set a.HInterID=" + HInterID.ToString() + ",a.HBillNo='" + HBillNo +"',a.HRelationInterID= 0 from KF_WeighSource_Temp a where a.HInterID<>" + HInterID.ToString() + " and a.HMaker='" + HMaker + "' and a.HSourceBillNo='" + ProcessExchangeBillNo + "'");
//鍐欏叆鏉＄爜鍑哄叆搴撲复鏃惰〃
oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +
--
Gitblit v1.9.1