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/Dto/webApi/ErpRohinData.cs | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs b/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
index 35fb174..033e323 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -4,72 +4,71 @@
{
public string id { get; set; }
public string Eid { get; set; }
- public string? FBillNo { get; set; }
+ public string? FBillNo { get; set; }//閲囪喘鍗曞彿
+ public string? SALES_ORDER_ID { get; set; }//閿�鍞鍗曞彿
- public string? FSeq { get; set; }
+ public string? FSeq { get; set; }//閲囪喘璁㈠崟琛屽彿
//娌℃湁瀵瑰簲琛ㄥ瓧娈� -姹犲崡楠� 2025-01-10
//public string? FXSHTH { get; set; }
- public string? FMaterialId { get; set; }
- public string? FUnitId { get; set; }
- public string? FQty { get; set; }
- public string? FStockUnitID { get; set; }
- public string? FPriceUnitId { get; set; }
- public string? FPriceUnitQty { get; set; }
- public string? FDeliveryDate { get; set; }
- public string? FDeliveryEarlyDate { get; set; }
-
- public string? FDeliveryLastDate { get; set; }
+ public string? FMaterialId { get; set; } //鐗╂枡缂栫爜
+ public string? FUnitId { get; set; } //閲囪喘鍗曚綅
+ public string? FQty { get; set; } //閲囪喘鏁伴噺
+ public string? FStockUnitID { get; set; } //搴撳瓨鍗曚綅
+ public string? FPriceUnitId { get; set; } //璁′环鍗曚綅
+ public string? FPriceUnitQty { get; set; } //璁′环鏁伴噺
+ public string? FDeliveryDate { get; set; } //浜よ揣鏃ユ湡
+ public string? FDeliveryEarlyDate { get; set; } //鏈�鏃╀氦璐ф棩鏈�
+ public string? FDeliveryLastDate { get; set; } //鏈�鏅氫氦璐ф棩鏈�
// start
- public string? FRequireOrgId { get; set; }
- public string? FRequireDeptId { get; set; }
- public string? FReceiveOrgId { get; set; }
- public string? FReceiveDeptId { get; set; }
+ public string? FRequireOrgId { get; set; } //闇�姹傜粍缁�
+ // public string? FRequireDeptId { get; set; }
+ public string? FReceiveOrgId { get; set; } //鏀舵枡缁勭粐
+ public string? FReceiveDeptId { get; set; } //鏀舵枡閮ㄩ棬
- public string? FEntrySettleOrgId { get; set; }
+ public string? FEntrySettleOrgId { get; set; } //缁撶畻缁勭粐
// end
- public string? FGiveAway { get; set; }
+ public string? FGiveAway { get; set; } //鏄惁璧犲搧
//public string? FNote { get; set; }
- public string? FEntryNote { get; set; }
- public string? FSupMatId { get; set; }
- public string? FSupMatName { get; set; }
- public string? FSubreqBillNo { get; set; }
- public string? FLot { get; set; }
- public string? FMRPCloseStatus { get; set; }
- public string? FMRPFreezeStatus { get; set; }
- public string? FFreezerId { get; set; }
- public string? FFreezeDate { get; set; }
- public string? FMRPTerminateStatus { get; set; }
- public string? FTerminaterId { get; set; }
- public string? FTerminateDate { get; set; }
- public string? FReceiveQty { get; set; }
-
- public string? FRemainReceiveQty { get; set; }
+ public string? FEntryNote { get; set; } // 澶囨敞
+ public string? FSupMatId { get; set; } // 渚涘簲鍟嗙墿鏂欑紪鐮�
+ public string? FSupMatName { get; set; } // 渚涘簲鍟嗙墿鏂欏悕绉�
+ public string? FSubreqBillNo { get; set; } // 濮斿璁㈠崟缂栧彿
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FMRPCloseStatus { get; set; } // 涓氬姟鍏抽棴
+ public string? FMRPFreezeStatus { get; set; } // 涓氬姟鍐荤粨
+ public string? FFreezerId { get; set; } // 鍐荤粨浜�
+ public string? FFreezeDate { get; set; } // 鍐荤粨鏃ユ湡
+ public string? FMRPTerminateStatus { get; set; } // 涓氬姟缁堟
+ public string? FTerminaterId { get; set; } // 缁堟浜�
+ public string? FTerminateDate { get; set; } // 缁堟鏃ユ湡
+ public string? FReceiveQty { get; set; } // 绱鏀舵枡鏁伴噺
+ public string? FRemainReceiveQty { get; set; } // 鍓╀綑鏀舵枡鏁伴噺
//public string? FBaseStockInQty { get; set; }
public string? FStockInQty { get; set; } //绱鍏ュ簱鏁�
- public string? FRemainStockINQty { get; set; }
+ public string? FRemainStockINQty { get; set; } //鍓╀綑鍏ュ簱鏁伴噺
- public string? FMrbQty { get; set; }
+ public string? FMrbQty { get; set; } //绱閫�鏂欐暟閲�
//public string? FBaseCheckRetQty { get; set; }
//public string? FBaseStockRetQty { get; set; }
public string? FCHECKRETQTY { get; set; } //鏀舵枡鍙��鏁�
public string? FSTOCKRETQTY { get; set; } //搴撳瓨鍙��鏁�
- public string? FSrcBillTypeId { get; set; }
- public string? FSrcBillNo { get; set; }
- public string? FReqTraceNo { get; set; }
- public string? FMtoNo { get; set; }
- public string? FChangeFlag { get; set; }
- public string? FDemandType { get; set; }
- public string? FDemandBillNo { get; set; }
- public string? FDemandBillEntrySeq { get; set; }
+ public string? FSrcBillTypeId { get; set; } //婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } //婧愬崟缂栧彿
+ public string? FReqTraceNo { get; set; } //闇�姹傝窡韪彿
+ public string? FMtoNo { get; set; } //璁″垝璺熻釜鍙�
+ public string? FChangeFlag { get; set; } //鍙樻洿鏍囧織
+ public string? FDemandType { get; set; } //闇�姹傛潵婧�
+ public string? FDemandBillNo { get; set; } //闇�姹傚崟鎹紪鍙�
+ public string? FDemandBillEntrySeq { get; set; } //闇�姹傚崟鎹鍙�
//鏂板 鐢熶骇閫氱煡鍗曘�佸瀷鍙枫�丅OM澶囨敞 涓変釜瀛楁 --2025-01-11 姹犲崡楠�
- public string? F_CGDD_SCTZDA { get; set; }
+/* public string? F_CGDD_SCTZDA { get; set; }
public string? F_CGDD_XHA { get; set; }
- public string? F_XIFG_Text_apv { get; set; }
+ public string? F_XIFG_Text_apv { get; set; }*/
}
\ No newline at end of file
--
Gitblit v1.9.3