From d9d67e2c013a9f27df3e971508f96550eb2c210e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 12 十一月 2025 18:59:39 +0800
Subject: [PATCH] 小卫三码合一、过站解绑、
---
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index dae024a..6e4fbaa 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -15,6 +15,8 @@
using System.Management;
using System.Net.NetworkInformation;
using System.Printing;
+using WebAPI;
+using Newtonsoft.Json;
namespace WarM
{
@@ -424,7 +426,11 @@
}
this.Sub_SaveBill();
+ LogService.Write("==============================================================================================");
+ LogService.Write("鑾峰彇鎵撳嵃鍒楄〃銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
Display();
+ LogService.Write("鑾峰彇鎵撳嵃鍒楄〃缁撴潫銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("==============================================================================================");
if (radioButton_IsPrint_Yes.Checked == true)
{
@@ -846,6 +852,7 @@
HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+ HRemark = "PLC鑷姩鐢熸垚";
HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
@@ -952,14 +959,14 @@
string LIU = "";
int LEN = 4;
DataSet ds;
- string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' order by 鎵瑰彿 desc";
+ string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' and 澶囨敞 = 'PLC鑷姩鐢熸垚' order by 鎵瑰彿 desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
if (ds != null)
{
long count = 0;
if (ds.Tables[0].Rows.Count > 0)
{
- count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay, ""));
+ count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay+" ", ""));
}
LIU += count + 1;
while (LIU.Length < LEN) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
@@ -973,7 +980,7 @@
}
//鎷兼帴鎵瑰彿
- HBatchNo = sYear + sPeriod + sDay + LIU;
+ HBatchNo = sYear + sPeriod + sDay+" " + LIU;
}
@@ -1240,7 +1247,11 @@
this.Sub_SaveBill();
//鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁
+ LogService.Write("==============================================================================================");
+ LogService.Write("鑾峰彇鎵撳嵃鍒楄〃銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
Display();
+ LogService.Write("鑾峰彇鎵撳嵃鍒楄〃缁撴潫銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("==============================================================================================");
if (radioButton_IsPrint_Yes.Checked == true)
{
@@ -1271,6 +1282,8 @@
//鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁骞跺瓨鏀惧湪瀛愯〃grdList
private void Display()
{
+ LogService.Write("鎵撳嵃鍒楄〃鎼滅储璇彞锛氥�恠elect * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID銆�");
+
//璁剧疆妗ｆ鍒楄〃閫夐」鍗¤〃鏍兼暟鎹�
DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
@@ -1287,6 +1300,8 @@
DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
//鐢荤嚎
//GraphLine();
+
+ LogService.Write("鎵撳嵃鍒楄〃鏁版嵁锛氥��" + JsonConvert.SerializeObject(DSet.Tables[0]) + "銆�");
}
//鑾峰彇宸ュ崟褰撳ぉ鐗╂枡鐢熸垚鐨勬潯鐮佽褰�
--
Gitblit v1.9.1