From af3455bc13c0ed48f4e3fa1b1614f601df24f12c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 09 五月 2025 17:17:22 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs | 1 -
StandardInterface/MESApplication/Controllers/WomcaaController.cs | 5 ++++-
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs | 8 ++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
index 782124d..5441097 100644
--- a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
+++ b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
@@ -74,7 +74,6 @@
mesDeliveryBarcode.Id = single.Id;
}
-
mesDeliveryBarcode.DeliveryNo = barcode.DeliveryNo;
mesDeliveryBarcode.ProductCode = barcode.ProductCode;
diff --git a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
index 271308f..0510f0f 100644
--- a/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
+++ b/StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
@@ -34,11 +34,15 @@
try
{
dynamic resultInfos = new ExpandoObject();
- PrintBarcode save = m.Save(barcode);
+ var save = m.Save(barcode);
resultInfos = save;
- entity.Result = 1;
+ entity.Result = 0;
+ if (save)
+ {
+ entity.Result = 1;
+ }
entity.DealWith = 1;
_manager.save(entity);
diff --git a/StandardInterface/MESApplication/Controllers/WomcaaController.cs b/StandardInterface/MESApplication/Controllers/WomcaaController.cs
index 6ff858f..68b4c4b 100644
--- a/StandardInterface/MESApplication/Controllers/WomcaaController.cs
+++ b/StandardInterface/MESApplication/Controllers/WomcaaController.cs
@@ -41,7 +41,10 @@
entity.Result = 0;
- if (save) entity.Result = 1;
+ if (save)
+ {
+ entity.Result = 1;
+ }
entity.DealWith = 1;
_manager.save(entity);
--
Gitblit v1.9.3