From 2f0a743446b5b9771445e3db22089264f7d237cb Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 02 七月 2025 17:11:52 +0800
Subject: [PATCH] 11
---
MES.Service/Modes/MesRohInData.cs | 631 ++++++++++++++++++++++++++++-----------------------------
MES.Service/service/BasicData/MesRohInManager.cs | 6
MES.Service/Dto/webApi/ErpRohinData.cs | 5
MESApplication/appsettings.json | 2
4 files changed, 322 insertions(+), 322 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 304bbe1..cb57a62 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -67,6 +67,9 @@
public string? FDemandType { get; set; }
public string? FDemandBillNo { get; set; }
public string? FDemandBillEntrySeq { get; set; }
- public string? FSUBREQENTRYID { get; set; }
+ public string? FXifgKhdd { get; set; }
+ public string? FXifgKhxsdh { get; set; }
+ public string? FXifgNbddh { get; set; }
+ public string? Fsubreqentryid { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index b928a69..97c2dde 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -1,382 +1,375 @@
-锘縰sing SqlSugar;
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閲囪喘璁㈠崟鏄庣粏琛�
-/// </summary>
-[SugarTable("MES_ROH_IN_DATA")]
-public class MesRohInData
+namespace MES.Service.Modes
{
/// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; }
+ /// 閲囪喘璁㈠崟鏄庣粏琛�
+ ///</summary>
+ [SugarTable("MES_ROH_IN_DATA")]
+ public class MesRohInData
+ {
+ /// <summary>
+ /// 鏀舵枡閮ㄩ棬
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
+ public string? ReceivingDepartment { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string? SalesOrderId { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_ID")]
+ public string? SalesOrderId { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_LINE_ID")]
- public string? OrderLineId { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName = "ORDER_LINE_ID")]
+ public string? OrderLineId { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public string? ItemId { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public string? ItemId { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- // [SugarColumn(ColumnName = "ITEM_NAME")]
- [SugarColumn(IsIgnore = true)]
- public string? ItemName { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "PURCHASE_UNIT")]
+ public string? PurchaseUnit { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- // [SugarColumn(ColumnName = "ITEM_SPEC")]
- [SugarColumn(IsIgnore = true)]
- public string? ItemSpec { get; set; }
+ /// <summary>
+ /// 閲囪喘鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "PURCHASE_QTY")]
+ public decimal? PurchaseQty { get; set; }
- /// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_UNIT")]
- public string? PurchaseUnit { get; set; }
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "INVENTORY_UNIT")]
+ public string? InventoryUnit { get; set; }
- /// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_QTY")]
- public decimal? PurchaseQty { get; set; }
+ /// <summary>
+ /// 璁′环鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "PRICING_UNIT")]
+ public string? PricingUnit { get; set; }
- /// <summary>
- /// 搴撳瓨鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "INVENTORY_UNIT")]
- public string? InventoryUnit { get; set; }
+ /// <summary>
+ /// 璁′环鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "PRICING_QTY")]
+ public decimal? PricingQty { get; set; }
- /// <summary>
- /// 璁′环鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRICING_UNIT")]
- public string? PricingUnit { get; set; }
+ /// <summary>
+ /// 浜よ揣鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ public DateTime? DeliveryDate { get; set; }
- /// <summary>
- /// 璁′环鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PRICING_QTY")]
- public decimal? PricingQty { get; set; }
+ /// <summary>
+ /// 鏈�鏃╀氦璐ф棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")]
+ public DateTime? EarliestDeliveryDate { get; set; }
- /// <summary>
- /// 浜よ揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_DATE")]
- public DateTime? DeliveryDate { get; set; }
+ /// <summary>
+ /// 鏈�鏅氫氦璐ф棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")]
+ public DateTime? LatestDeliveryDate { get; set; }
- /// <summary>
- /// 鏈�鏃╀氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")]
- public DateTime? EarliestDeliveryDate { get; set; }
+ /// <summary>
+ /// 闇�姹傜粍缁�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_ORG")]
+ public string? DemandOrg { get; set; }
- /// <summary>
- /// 鏈�鏅氫氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")]
- public DateTime? LatestDeliveryDate { get; set; }
+ /// <summary>
+ /// 鏀舵枡缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVING_ORG")]
+ public string? ReceivingOrg { get; set; }
- /// <summary>
- /// 闇�姹傜粍缁�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_ORG")]
- public string? DemandOrg { get; set; }
+ /// <summary>
+ /// 缁撶畻缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "SETTLEMENT_ORG")]
+ public string? SettlementOrg { get; set; }
- /// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_ORG")]
- public string? ReceivingOrg { get; set; }
+ /// <summary>
+ /// 鏄惁璧犲搧
+ ///</summary>
+ [SugarColumn(ColumnName = "IS_GIFT")]
+ public string? IsGift { get; set; }
- /// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SETTLEMENT_ORG")]
- public string? SettlementOrg { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string? Remarks { get; set; }
- /// <summary>
- /// 鏄惁璧犲搧
- /// </summary>
- [SugarColumn(ColumnName = "IS_GIFT")]
- public string? IsGift { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙墿鏂欑紪鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
+ public string? SupplierItemCode { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙墿鏂欏悕绉�
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
+ public string? SupplierItemName { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙墿鏂欑紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
- public string? SupplierItemCode { get; set; }
+ /// <summary>
+ /// 濮斿璁㈠崟缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
+ public string? OutsourcingOrderId { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙墿鏂欏悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
- public string? SupplierItemName { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName = "BATCH_NUMBER")]
+ public string? BatchNumber { get; set; }
- /// <summary>
- /// 濮斿璁㈠崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
- public string? OutsourcingOrderId { get; set; }
+ /// <summary>
+ /// 涓氬姟鍏抽棴 A:姝ｅ父锛孊:涓氬姟缁堟
+ ///</summary>
+ [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
+ public string? BusinessClose { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "BATCH_NUMBER")]
- public string? BatchNumber { get; set; }
+ /// <summary>
+ /// 涓氬姟鍐荤粨 A:姝ｅ父锛孊:涓氬姟缁堟
+ ///</summary>
+ [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
+ public string? BusinessFreeze { get; set; }
- /// <summary>
- /// 涓氬姟鍏抽棴 A:姝ｅ父锛孊:涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
- public string? BusinessClose { get; set; }
+ /// <summary>
+ /// 鍐荤粨浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "FREEZER")]
+ public string? Freezer { get; set; }
- /// <summary>
- /// 涓氬姟鍐荤粨 A:姝ｅ父锛孊:涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
- public string? BusinessFreeze { get; set; }
+ /// <summary>
+ /// 鍐荤粨鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "FREEZE_TIME")]
+ public DateTime? FreezeTime { get; set; }
- /// <summary>
- /// 鍐荤粨浜�
- /// </summary>
- [SugarColumn(ColumnName = "FREEZER")]
- public string? Freezer { get; set; }
+ /// <summary>
+ /// 涓氬姟缁堟
+ ///</summary>
+ [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
+ public string? BusinessTerminate { get; set; }
- /// <summary>
- /// 鍐荤粨鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "FREEZE_TIME")]
- public DateTime? FreezeTime { get; set; }
+ /// <summary>
+ /// 缁堟浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "TERMINATOR")]
+ public string? Terminator { get; set; }
- /// <summary>
- /// 涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
- public string? BusinessTerminate { get; set; }
+ /// <summary>
+ /// 缁堟鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "TERMINATE_TIME")]
+ public DateTime? TerminateTime { get; set; }
- /// <summary>
- /// 缁堟浜�
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATOR")]
- public string? Terminator { get; set; }
+ /// <summary>
+ /// 绱鏀舵枡鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
+ public decimal? TotalReceivedQty { get; set; }
- /// <summary>
- /// 缁堟鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATE_TIME")]
- public DateTime? TerminateTime { get; set; }
+ /// <summary>
+ /// 鍓╀綑鏀舵枡鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
+ public decimal? RemainingReceivedQty { get; set; }
- /// <summary>
- /// 绱鏀舵枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
- public decimal? TotalReceivedQty { get; set; }
+ /// <summary>
+ /// 绱鍏ュ簱鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
+ public decimal? TotalStoredQty { get; set; }
- /// <summary>
- /// 鍓╀綑鏀舵枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
- public decimal? RemainingReceivedQty { get; set; }
+ /// <summary>
+ /// 鍓╀綑鍏ュ簱鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "REMAINING_STORED_QTY")]
+ public decimal? RemainingStoredQty { get; set; }
- /// <summary>
- /// 绱鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
- public decimal? TotalStoredQty { get; set; }
+ /// <summary>
+ /// 绱閫�鏂欐暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
+ public decimal? TotalReturnedQty { get; set; }
- /// <summary>
- /// 鍓╀綑鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "REMAINING_STORED_QTY")]
- public decimal? RemainingStoredQty { get; set; }
+ /// <summary>
+ /// 鏀舵枡鍙��鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
+ public decimal? ReturnableReceivedQty { get; set; }
- /// <summary>
- /// 绱閫�鏂欐暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
- public decimal? TotalReturnedQty { get; set; }
+ /// <summary>
+ /// 搴撳瓨鍙��鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
+ public decimal? ReturnableStoredQty { get; set; }
- /// <summary>
- /// 鏀舵枡鍙��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
- public decimal? ReturnableReceivedQty { get; set; }
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
+ public string? SourceDocumentType { get; set; }
- /// <summary>
- /// 搴撳瓨鍙��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
- public decimal? ReturnableStoredQty { get; set; }
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
+ public string? SourceDocumentId { get; set; }
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
- public string? SourceDocumentType { get; set; }
+ /// <summary>
+ /// 闇�姹傝窡韪彿
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
+ public string? DemandTrackingId { get; set; }
- /// <summary>
- /// 婧愬崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
- public string? SourceDocumentId { get; set; }
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
+ public string? PlanTrackingId { get; set; }
- /// <summary>
- /// 闇�姹傝窡韪彿
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
- public string? DemandTrackingId { get; set; }
+ /// <summary>
+ /// 鍙樻洿鏍囧織
+ ///</summary>
+ [SugarColumn(ColumnName = "CHANGE_FLAG")]
+ public string? ChangeFlag { get; set; }
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
- public string? PlanTrackingId { get; set; }
+ /// <summary>
+ /// 闇�姹傛潵婧�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_SOURCE")]
+ public string? DemandSource { get; set; }
- /// <summary>
- /// 鍙樻洿鏍囧織
- /// </summary>
- [SugarColumn(ColumnName = "CHANGE_FLAG")]
- public string? ChangeFlag { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹紪鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
+ public string? DemandDocumentId { get; set; }
- /// <summary>
- /// 闇�姹傛潵婧�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_SOURCE")]
- public string? DemandSource { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
+ public string? DemandDocumentLineId { get; set; }
- /// <summary>
- /// 闇�姹傚崟鎹紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
- public string? DemandDocumentId { get; set; }
+ /// <summary>
+ /// ERP鐨処D鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
+ public decimal? EbelnK3id { get; set; }
- /// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
- public string? DemandDocumentLineId { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�1
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
- /// <summary>
- /// ERP鐨処D鍙�
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�2
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string? Remark2 { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK3")]
+ public string? Remark3 { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string? Remark4 { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK5")]
+ public string? Remark5 { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
+ /// <summary>
+ /// SEQ_BASEINFO_ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ /// <summary>
+ /// ERP澶碔D
+ ///</summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public decimal? ErpId { get; set; }
- /// <summary>
- /// SEQ_BASEINFO_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
+ public string? PurchaseOrderLineNumber { get; set; }
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public decimal? ErpId { get; set; }
+ /// <summary>
+ /// 闇�姹傜粍缁�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND")]
+ public string? Demand { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "purchase_order_line_number")]
- public string? PurchaseOrderLineNumber { get; set; }
+ /// <summary>
+ /// 鏀舵枡缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVING")]
+ public string? Receiving { get; set; }
- /// <summary>
- /// 闇�姹傜粍缁�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND")]
- public string? Demand { get; set; }
+ /// <summary>
+ /// 缁撶畻缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "SETTLEMENT")]
+ public string? Settlement { get; set; }
- /// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING")]
- public string? Receiving { get; set; }
+ /// <summary>
+ /// 宸蹭氦璐ф暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "CGB014")]
+ public decimal? Cgb014 { get; set; }
- /// <summary>
- /// 鏀舵枡閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
- public string? ReceivingDepartment { get; set; }
+ /// <summary>
+ /// 闇�姹傞儴闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "DEMAND_DEPT")]
+ public string? DemandDept { get; set; }
- /// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SETTLEMENT")]
- public string? Settlement { get; set; }
+ /// <summary>
+ /// 鏀舵枡閮ㄩ棬
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVING_DEPT")]
+ public string? ReceivingDept { get; set; }
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DEPT")]
- public string? DemandDept { get; set; }
+ /// <summary>
+ /// 棰勮鍒拌揣鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "ARRIVE_DATE")]
+ public DateTime? ArriveDate { get; set; }
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_DEPT")]
- public string? ReceivingDept { get; set; }
-
- /// <summary>
- /// 棰勮鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "ARRIVE_DATE")]
- public DateTime? ArriveDate { get; set; }
-
-
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "FSUBREQENTRYID")]
- public decimal? FSUBREQENTRYID { get; set; }
-
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index c52d600..9908235 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -271,7 +271,11 @@
DemandDocumentId = s.FDemandBillNo,
DemandDocumentLineId = s.FDemandBillEntrySeq,
DemandDept = s.FRequireDeptId,
- FSUBREQENTRYID = Convert.ToDecimal(s.FSUBREQENTRYID)
+ Remark1 = s.FXifgKhdd, //瀹㈡埛璁㈠崟
+ Remark2 = s.FXifgKhxsdh, //瀹㈡埛閿�鍞崟鍙�
+ Remark3 = s.FXifgNbddh, //鍐呴儴璁㈠崟鍙�
+ Remark4 = s.Fsubreqentryid,//濮斿璁㈠崟鍒嗗綍鍐呯爜
+
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index f241b7f..93ad495 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
"ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.110.189)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xg_dev; Password=xgdev"
+ "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.46)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xg_dev; Password=xgdev"
}
}
--
Gitblit v1.9.3