From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/Gy_RoutingBillSub.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_RoutingBillSub.cs b/WebAPI/Models/Gy_RoutingBillSub.cs
index 59d1023..6ad1cc4 100644
--- a/WebAPI/Models/Gy_RoutingBillSub.cs
+++ b/WebAPI/Models/Gy_RoutingBillSub.cs
@@ -10,6 +10,7 @@
public long HProcID { get; set; }//宸ュ簭ID
public string HProcNo { get; set; }//娴佹按鍙�
public long HSupID { get; set; }//渚涘簲鍟咺D
+ public bool HSNCtrl { get; set; }//SN杩囩珯
public bool HSupFlag { get; set; }//澶栧崗鏍囪
public double HWorkQty { get; set; }//鍔犲伐鏁伴噺
public double HPassRate { get; set; }//鑹巼
@@ -74,8 +75,18 @@
public double HEstimate;//璁℃椂鏆備及
public bool HIsTime;//鏄惁璁℃椂
+ public bool HSortProcFlag;
+
public int HQCSchemeID_Fst;
public int HQCSchemeID_Proc;
public int HQCSchemeID_Patrol;
+
+ public bool HQCFst;//銆婃槸鍚﹂浠躲��
+ public bool HQCProc;//銆婃槸鍚︽湯妫�锛堝閫夋鎵撳嬀锛夈��
+ public bool HQCPatrol;//銆婃槸鍚﹀贰妫�锛堝閫夋鎵撳嬀锛� 銆�
+ public bool HMaterToSourceCtrl;//銆婁笂鏂欓槻閿欐帶锛堝閫夋鎵撳嬀锛� 銆�
+
+ public decimal HSubStdEmpAvg_S;//浜х嚎浜哄潎浜ц兘
+ public decimal HYDCoefficient;//绾﹀綋绯绘暟
}
}
\ No newline at end of file
--
Gitblit v1.9.1