From 90b1cce02de94cc36870310bb7c54a8b15b4101d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 09 一月 2025 11:26:47 +0800
Subject: [PATCH] 1
---
PayM/bin/x86/Debug/DAL.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
PayM/obj/x86/Debug/PayM.pdb | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 8 ++++----
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
PayM/obj/x86/Debug/PayM.dll | 0
DAL/公用/frmHlpBillList1.cs | 3 ++-
PayM/bin/x86/Debug/BLL.pdb | 0
10 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs" "b/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
index 5be6dba..7a00bfd 100644
--- "a/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
+++ "b/DAL/\345\205\254\347\224\250/frmHlpBillList1.cs"
@@ -55,7 +55,8 @@
}
sSql = frmCondition.SqlStr + sWhere ;
-
+
+ sSql = sSql.Replace("AND 作废人=''", "");
//
DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 3bce363..e0d7bf2 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index 443b4a4..310e389 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index 74b032b..7fc5b3f 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index cbb97c6..86dab74 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 4fedc2b..9b9676b 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index eccf76a..d89b5ca 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index 4fedc2b..9b9676b 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index eccf76a..d89b5ca 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
index 4d01146..7786c33 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -1363,9 +1363,9 @@
{
string message = Encoding.UTF8.GetString(e.Message);
List<MQTT_MainEntity> mQTT_MainEntity = getObjectByJson_Xs_OutDoorBillMain(message);
- for(int i = 0; i < mQTT_MainEntity[0].data.Count; i++)
+ for(int i = 0; i < mQTT_MainEntity[0].values.Count; i++)
{
- if (mQTT_MainEntity[0].data[i].id == textBox_WorkPositionParams.Text && mQTT_MainEntity[0].data[i].value == true)
+ if (mQTT_MainEntity[0].values[i].id == textBox_WorkPositionParams.Text && mQTT_MainEntity[0].values[i].v == true)
{
produceQty += 1;
}
@@ -2635,12 +2635,12 @@
public class MQTT_MainEntity
{
public string timestamp;
- public List<MQTT_SubEntity> data;
+ public List<MQTT_SubEntity> values;
}
public class MQTT_SubEntity
{
public string id; //宸ヤ綅
- public bool value; //缁撴灉
+ public bool v; //缁撴灉
public long t; //鏃堕棿鎴�
}
#endregion
--
Gitblit v1.9.1