From 7cacc9eb3f246fa46e94c0f557fd6f4e1a07bb94 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期三, 26 五月 2021 17:43:25 +0800
Subject: [PATCH] 解决冲突

---
 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index 70eee49..7274261 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -124,7 +124,7 @@
                 string HBarCode = list[0].HBarCode;//鏉″舰鐮�
                 string HAddr = "";
                 string HBarCodeMaker = "";
-                string BillType = "3791";
+                string BillType = "3793";
                 double HWasterQty = list[0].HWasterQty;//涓嶅悎鏍兼暟閲�
                 long HPlanPieceQty = list[0].HPlanPieceQty;//鍙戝嚭浠舵暟
                 long HBadPNL = list[0].HBadPNL;//鎶ュ簾浠舵暟

--
Gitblit v1.9.1