From da2072076040de7598d844cdd3ceaa796b089ca5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 十一月 2024 10:10:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 2207f87..7875f1c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1288,6 +1288,10 @@
                         {
                             HBarCodeType = "鍞竴鏉$爜";
                         }
+                        if (CampanyName == "涔濊彵")
+                        {
+                            HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
+                        }
                         //
                         HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
                         HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);

--
Gitblit v1.9.1