From 96ee6437185cc02f17a8286967fd0f0eb88d9328 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 15 九月 2025 19:23:46 +0800
Subject: [PATCH] 111
---
MES.Service/Modes/Womcab.cs | 226 ++++----
MES.Service/Modes/SalesOrderDetail.cs | 405 +++++++-------
MES.Service/Modes/Womcaa.cs | 292 ++++++-----
MES.Service/Modes/SalesOrder.cs | 348 ++++++++----
MES.Service/service/WomcaaManager.cs | 94 +++
MES.Service/service/BasicData/SalesOrderManager.cs | 171 +++++-
6 files changed, 920 insertions(+), 616 deletions(-)
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
index d6c2e24..29ddedc 100644
--- a/MES.Service/Modes/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder.cs
@@ -9,134 +9,230 @@
public class SalesOrder
{
/// <summary>
- /// SEQ_sales搴忓垪
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public Guid? Id { get; set; }
-
- [SugarColumn(ColumnName = "ERP_ID")]
- public decimal? ErpID { get; set; } // ERPID
-
- [SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; } // 鍗曟嵁缂栧彿
-
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public string? BillTypeId { get; set; } // 鍗曟嵁绫诲瀷
-
- [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
- public string? DocumentStatus { get; set; } // 鍗曟嵁鐘舵��
-
- [SugarColumn(ColumnName = "F_DATE")]
- public DateTime? FDate { get; set; } // 鏃ユ湡
-
- [SugarColumn(ColumnName = "BUSINESS_TYPE")]
- public string? BusinessType { get; set; } // 涓氬姟绫诲瀷
-
- [SugarColumn(ColumnName = "HEAD_DELIVERY_WAY")]
- public string? HeadDeliveryWay { get; set; } // 浜よ揣鏂瑰紡
-
- [SugarColumn(ColumnName = "HEAD_LOC_ID")]
- public string? HeadLocId { get; set; } // 浜よ揣鍦扮偣
-
- [SugarColumn(ColumnName = "SALE_ORG_ID")]
- public string? SaleOrgId { get; set; } // 閿�鍞粍缁�
-
- //[SugarColumn(ColumnName = "UNW_TEXT_KHDD")]
- //public string? UnWTextKhdd { get; set; } // 瀹㈡埛璁㈠崟
-
- //[SugarColumn(ColumnName = "UNW_DATE_KHXQ")]
- //public DateTime? UnWDateKhxq { get; set; } // 瀹㈡埛闇�姹備氦鏈�
-
- //[SugarColumn(ColumnName = "UNW_BASE_PROPERTY_KHDJ")]
- //public string? UnWBasePropertyKhdj { get; set; } // 瀹㈡埛绛夌骇
-
- [SugarColumn(ColumnName = "CUST_ID")]
- public string? CustId { get; set; } // 瀹㈡埛
-
- //[SugarColumn(ColumnName = "UNW_LARGE_TEXT_TBKHBZ")]
- //public string? UnWLargetextTbkhbz { get; set; } // 娣樺疂瀹㈡埛澶囨敞
-
- [SugarColumn(ColumnName = "CLOSE_STATUS")]
- public string? CloseStatus { get; set; } // 鍏抽棴鐘舵��
-
- [SugarColumn(ColumnName = "SALE_DEPT_ID")]
- public string? SaleDeptId { get; set; } // 閿�鍞儴闂�
-
- [SugarColumn(ColumnName = "SALER_ID")]
- public string? SalerId { get; set; } // 閿�鍞憳
-
- [SugarColumn(ColumnName = "NOTE")]
- public string? Note { get; set; } // 澶囨敞
-
- //[SugarColumn(ColumnName = "UNW_REMARKS_KHJHDD")]
- //public string? UnWRemarksKhjHdd { get; set; } // 瀹㈡埛浜よ揣鍦扮偣
- [SugarColumn(ColumnName = "RECEIVE_ID")]
- public string? ReceiveId { get; set; } // 鏀惰揣鏂�
-
- [SugarColumn(ColumnName = "RECEIVE_CONTACT")]
- public string? ReceiveContact { get; set; } // 鏀惰揣鏂硅仈绯讳汉
-
- [SugarColumn(ColumnName = "SETTLE_ID")]
- public string? SettleId { get; set; } // 缁撶畻鏂�
-
- [SugarColumn(ColumnName = "APPROVER_ID")]
- public string? ApproverId { get; set; } // 瀹℃牳浜�
-
- [SugarColumn(ColumnName = "LINK_MAN")]
- public string? LinkMan { get; set; } // 鏀惰揣浜哄鍚�
-
- [SugarColumn(ColumnName = "CHARGE_ID")]
- public string? ChargeId { get; set; } // 浠樻鏂�
-
- [SugarColumn(ColumnName = "LINK_PHONE")]
- public string? LinkPhone { get; set; } // 鑱旂郴鐢佃瘽
-
- [SugarColumn(ColumnName = "CREATOR_ID")]
- public string? CreatorId { get; set; } // 鍒涘缓浜�
-
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; } // 鍒涘缓鏃ユ湡
-
- [SugarColumn(ColumnName = "MODIFIER_ID")]
- public string? ModifierId { get; set; } // 鏈�鍚庝慨鏀逛汉
-
- [SugarColumn(ColumnName = "MODIFY_DATE")]
- public DateTime? ModifyDate { get; set; } // 鏈�鍚庝慨鏀规棩鏈�
-
- [SugarColumn(ColumnName = "APPROVE_DATE")]
- public DateTime? ApproveDate { get; set; } // 瀹℃牳鏃ユ湡
-
- [SugarColumn(ColumnName = "CLOSER_ID")]
- public string? CloserId { get; set; } // 鍏抽棴浜�
-
- [SugarColumn(ColumnName = "CLOSE_DATE")]
- public DateTime? CloseDate { get; set; } // 鍏抽棴鏃ユ湡
-
- [SugarColumn(ColumnName = "CHANGE_DATE")]
- public DateTime? ChangeDate { get; set; } // 鍙樻洿鏃ユ湡
-
- [SugarColumn(ColumnName = "CANCEL_STATUS")]
- public string? CancelStatus { get; set; } // 浣滃簾鐘舵��
-
- [SugarColumn(ColumnName = "CANCELLER_ID")]
- public string? CancellerId { get; set; } // 浣滃簾浜�
-
- [SugarColumn(ColumnName = "VERSION_NO")]
- public double? VersionNo { get; set; } // 鐗堟湰鍙�
-
- [SugarColumn(ColumnName = "CHANGE_REASON")]
- public string? ChangeReason { get; set; } // 鍙樻洿鍘熷洜
-
- [SugarColumn(ColumnName = "CHANGER_ID")]
- public string? ChangerId { get; set; } // 鍙樻洿浜�
-
- [SugarColumn(ColumnName = "ENTRY_NOTE")]
- public string? EntryNote { get; set; } // 澶囨敞
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
/// <summary>
- /// 鍚屾鏃堕棿
- /// </summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "erp_id")]
+ public decimal? ErpId { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "bill_no")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "bill_type_id")]
+ public string? BillTypeId { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "document_status")]
+ public string? DocumentStatus { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "f_date")]
+ public DateTime? FDate { get; set; }
+
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "business_type")]
+ public string? BusinessType { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName = "head_delivery_way")]
+ public string? HeadDeliveryWay { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ ///</summary>
+ [SugarColumn(ColumnName = "head_loc_id")]
+ public string? HeadLocId { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛
+ ///</summary>
+ [SugarColumn(ColumnName = "cust_id")]
+ public string? CustId { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "close_status")]
+ public string? CloseStatus { get; set; }
+
+ /// <summary>
+ /// 閿�鍞儴闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "sale_dept_id")]
+ public string? SaleDeptId { get; set; }
+
+ /// <summary>
+ /// 閿�鍞憳
+ ///</summary>
+ [SugarColumn(ColumnName = "saler_id")]
+ public string? SalerId { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿鍘熷洜
+ ///</summary>
+ [SugarColumn(ColumnName = "change_reason")]
+ public string? ChangeReason { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "note")]
+ public string? Note { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏂�
+ ///</summary>
+ [SugarColumn(ColumnName = "settle_id")]
+ public string? SettleId { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "approver_id")]
+ public string? ApproverId { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣浜哄鍚�
+ ///</summary>
+ [SugarColumn(ColumnName = "link_man")]
+ public string? LinkMan { get; set; }
+
+ /// <summary>
+ /// 浠樻鏂�
+ ///</summary>
+ [SugarColumn(ColumnName = "charge_id")]
+ public string? ChargeId { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ ///</summary>
+ [SugarColumn(ColumnName = "link_phone")]
+ public string? LinkPhone { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "creator_id")]
+ public string? CreatorId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "create_date")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ ///</summary>
+ [SugarColumn(ColumnName = "modifier_id")]
+ public string? ModifierId { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "modify_date")]
+ public DateTime? ModifyDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "approve_date")]
+ public DateTime? ApproveDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "closer_id")]
+ public string? CloserId { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "close_date")]
+ public DateTime? CloseDate { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "change_date")]
+ public DateTime? ChangeDate { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "cancel_status")]
+ public string? CancelStatus { get; set; }
+
+ /// <summary>
+ /// 浣滃簾浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "canceller_id")]
+ public string? CancellerId { get; set; }
+
+ /// <summary>
+ /// 鐗堟湰鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "version_no")]
+ public int? VersionNo { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "changer_id")]
+ public string? ChangerId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "entry_note")]
+ public string? EntryNote { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "fbilltype")]
+ public string? Fbilltype { get; set; }
+
+ /// <summary>
+ /// 閿�鍞粍缁嘔D
+ ///</summary>
+ [SugarColumn(ColumnName = "SALE_ORG_ID")]
+ public string? SaleOrgId { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂�
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVE_ID")]
+ public string? ReceiveId { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂硅仈绯讳汉
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVE_CONTACT")]
+ public string? ReceiveContact { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
public DateTime? SynchronousDate { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 0cce5a2..07c1416 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -9,243 +9,248 @@
public class SalesOrderDetail
{
/// <summary>
- /// SEQ_sales搴忓垪
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
public Guid Id { get; set; }
/// <summary>
- /// SEQ_sales搴忓垪
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "pid")]
- public Guid? Pid { get; set; }
+ public Guid Pid { get; set; }
/// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public decimal? ErpID { get; set; }
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "erp_id")]
+ public int? ErpId { get; set; }
/// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "E_HID")]
- public decimal? EHID { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_ID")]
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "material_id")]
public string? MaterialId { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
+ /// 閿�鍞崟浣�
+ ///</summary>
+ [SugarColumn(ColumnName = "unit_id")]
+ public string? UnitId { get; set; }
+
+ /// <summary>
+ /// 閿�鍞暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "qty")]
+ public decimal? Qty { get; set; }
+
+ /// <summary>
+ /// 璁′环鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "price_unit_id")]
+ public string? PriceUnitId { get; set; }
+
+ /// <summary>
+ /// 璁′环鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "price_unit_qty")]
+ public decimal? PriceUnitQty { get; set; }
+
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "delivery_date")]
+ public DateTime? DeliveryDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁璧犲搧
+ ///</summary>
+ [SugarColumn(ColumnName = "is_free")]
+ public string? IsFree { get; set; }
+
+ /// <summary>
+ /// 璐т富绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "owner_type_id")]
+ public string? OwnerTypeId { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ ///</summary>
+ [SugarColumn(ColumnName = "owner_id")]
+ public string? OwnerId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "entry_note")]
+ public string? EntryNote { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "mto_no")]
+ public string? MtoNo { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName = "lot")]
+ public string? Lot { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣涓婇檺
+ ///</summary>
+ [SugarColumn(ColumnName = "delivery_max_qty")]
+ public decimal? DeliveryMaxQty { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣涓嬮檺
+ ///</summary>
+ [SugarColumn(ColumnName = "delivery_min_qty")]
+ public decimal? DeliveryMinQty { get; set; }
+
+ /// <summary>
+ /// 瓒呭彂鎺у埗鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "out_lmt_unit_id")]
+ public string? OutLmtUnitId { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鍏抽棴
+ ///</summary>
+ [SugarColumn(ColumnName = "mrp_close_status")]
+ public string? MrpCloseStatus { get; set; }
+
+ /// <summary>
+ /// 涓氬姟缁堟
+ ///</summary>
+ [SugarColumn(ColumnName = "mrp_terminate_status")]
+ public string? MrpTerminateStatus { get; set; }
+
+ /// <summary>
+ /// 缁堟鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "terminate_date")]
+ public DateTime? TerminateDate { get; set; }
+
+ /// <summary>
+ /// 缁堟浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "terminater_id")]
+ public string? TerminaterId { get; set; }
+
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "src_type")]
+ public string? SrcType { get; set; }
+
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "src_bill_no")]
+ public string? SrcBillNo { get; set; }
+
+ /// <summary>
+ /// 绱鍙戣揣閫氱煡鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "deli_qty")]
+ public decimal? DeliQty { get; set; }
+
+ /// <summary>
+ /// 绱鍑哄簱鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "stock_out_qty")]
+ public decimal? StockOutQty { get; set; }
+
+ /// <summary>
+ /// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ ///</summary>
+ [SugarColumn(ColumnName = "base_ret_notice_qty")]
+ public decimal? BaseRetNoticeQty { get; set; }
+
+ /// <summary>
+ /// 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
+ ///</summary>
+ [SugarColumn(ColumnName = "base_return_qty")]
+ public decimal? BaseReturnQty { get; set; }
+
+ /// <summary>
+ /// 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
+ ///</summary>
+ [SugarColumn(ColumnName = "base_remain_out_qty")]
+ public decimal? BaseRemainOutQty { get; set; }
+
+ /// <summary>
+ /// 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
+ ///</summary>
+ [SugarColumn(ColumnName = "basearqty")]
+ public decimal? Basearqty { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "cust_ino")]
+ public string? CustIno { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "cust_inm")]
+ public string? CustInm { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName = "cust_imd")]
+ public string? CustImd { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "MAP_ID")]
public string? MapId { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡鍚嶇О
- /// </summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "MAP_NAME")]
public string? MapName { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡瑙勬牸
- /// </summary>
+ /// 瀹㈡埛鐗╂枡瑙勬牸
+ ///</summary>
[SugarColumn(ColumnName = "MAP_SPEC")]
public string? MapSpec { get; set; }
/// <summary>
- /// 搴忓彿
- /// </summary>
+ /// 搴忓彿
+ ///</summary>
[SugarColumn(ColumnName = "Seq")]
public int? Seq { get; set; }
/// <summary>
- /// 閿�鍞崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "UNIT_ID")]
- public string? UnitId { get; set; }
-
- /// <summary>
- /// 閿�鍞暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "QTY")]
- public decimal? Qty { get; set; }
-
- /// <summary>
- /// 璁′环鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRICE_UNIT_ID")]
- public string? PriceUnitId { get; set; }
-
- /// <summary>
- /// 璁′环鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PRICE_UNIT_QTY")]
- public decimal? PriceUnitQty { get; set; }
-
- /// <summary>
- /// 瑕佽揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_DATE")]
- public DateTime? DeliveryDate { get; set; }
-
- /// <summary>
- /// 鏄惁璧犲搧
- /// </summary>
- [SugarColumn(ColumnName = "IS_FREE")]
- public string? IsFree { get; set; }
-
- ///// <summary>
- ///// 閿�鍞鍗曞彿
- ///// </summary>
- //[SugarColumn(ColumnName = "UNW_TEXT_XSDDH")]
- //public string? SalesOrderNo { get; set; }
-
- /// <summary>
- /// 渚涘簲缁勭粐
- /// </summary>
+ /// 渚涘簲缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLY_ORG_ID")]
public string? SupplyOrgId { get; set; }
/// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
+ /// 搴撳瓨缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "STOCK_ORG_ID")]
public string? StockOrgId { get; set; }
/// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
+ /// 缁撶畻缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "SETTLE_ORG_IDS")]
public string? SettleOrgIds { get; set; }
-
- ///// <summary>
- ///// 璺熷崟鍛�
- ///// </summary>
- //[SugarColumn(ColumnName = "UNW_BASE_GDY")]
- //public string? SalesFollowUp { get; set; }
-
/// <summary>
- /// 璐т富绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
- public string? OwnerTypeId { get; set; }
-
- /// <summary>
- /// 璐т富
- /// </summary>
- [SugarColumn(ColumnName = "OWNER_ID")]
- public string? OwnerId { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "ENTRY_NOTE")]
- public string? EntryNote { get; set; }
-
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "MTO_NO")]
- public string? MtoNo { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
- public string? Lot { get; set; }
-
- /// <summary>
- /// 鍙戣揣涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_MAX_QTY")]
- public decimal? DeliveryMaxQty { get; set; }
-
- /// <summary>
- /// 鍙戣揣涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_MIN_QTY")]
- public decimal? DeliveryMinQty { get; set; }
-
- /// <summary>
- /// 瓒呭彂鎺у埗鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "OUT_LMT_UNIT_ID")]
- public string? OutLmtUnitId { get; set; }
-
- /// <summary>
- /// 涓氬姟鍏抽棴
- /// </summary>
- [SugarColumn(ColumnName = "MRP_CLOSE_STATUS")]
- public string? MrpCloseStatus { get; set; }
-
- /// <summary>
- /// 涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "MRP_TERMINATE_STATUS")]
- public string? MrpTerminateStatus { get; set; }
-
- /// <summary>
- /// 缁堟鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATE_DATE")]
- public DateTime? TerminateDate { get; set; }
-
- /// <summary>
- /// 缁堟浜�
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATER_ID")]
- public string? TerminaterId { get; set; }
-
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SRC_TYPE")]
- public string? SrcType { get; set; }
-
- /// <summary>
- /// 婧愬崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string? SrcBillNo { get; set; }
-
- /// <summary>
- /// 绱鍙戣揣閫氱煡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DELI_QTY")]
- public decimal? DeliQty { get; set; }
-
- /// <summary>
- /// 绱鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_OUT_QTY")]
- public decimal? StockOutQty { get; set; }
-
- /// <summary>
- /// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
- [SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
- public decimal? BaseRetNoticeQty { get; set; } /// </summary>
-
- /// <summary>
- /// 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
- /// </summary>
- [SugarColumn(ColumnName = "BASE_RETURN_QTY")]
- public decimal? BaseReturnQty { get; set; }
-
- /// <summary>
- /// 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
- /// </summary>
- [SugarColumn(ColumnName = "BASE_REMAIN_OUT_QTY")]
- public decimal? BaseRemainOutQty { get; set; }
-
- /// <summary>
- /// 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
- /// </summary>
- [SugarColumn(ColumnName = "BASEARQTY")]
- public decimal? BASEARQTY { get; set; }
-
+ /// ERP鍗曟嵁琛ㄥごid
+ ///</summary>
+ [SugarColumn(ColumnName = "e_hid")]
+ public int? EHid { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 4840a67..0d791a2 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -9,427 +9,447 @@
public class Womcaa
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// ERPID
- /// </summary>
+ /// ERPID
+ ///</summary>
[SugarColumn(ColumnName = "ERPID")]
public int? Erpid { get; set; }
/// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
+ /// 鐢ㄦ枡娓呭崟鍗曟嵁缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "CAA001")]
public string? Caa001 { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷("1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇")
- /// </summary>
+ /// 鍗曟嵁绫诲瀷("1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇")
+ ///</summary>
[SugarColumn(ColumnName = "CAA004")]
public string? Caa004 { get; set; }
/// <summary>
- /// 璁″垝涓嬭揪鏃ユ湡
- /// </summary>
+ /// 璁″垝涓嬭揪鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CAA005")]
public string? Caa005 { get; set; }
/// <summary>
- /// 浜у搧ID
- /// </summary>
+ /// 浜у搧ID
+ ///</summary>
[SugarColumn(ColumnName = "CAA006")]
public string? Caa006 { get; set; }
/// <summary>
- /// 鍗曚綅
- /// </summary>
+ /// 鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "CAA009")]
public string? Caa009 { get; set; }
/// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
+ /// 棰勮寮�宸ユ椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "CAA010")]
public string? Caa010 { get; set; }
/// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "CAA011")]
public string? Caa011 { get; set; }
/// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "CAA012")]
public decimal? Caa012 { get; set; }
/// <summary>
- /// BOM鐗堟
- /// </summary>
+ /// BOM鐗堟
+ ///</summary>
[SugarColumn(ColumnName = "CAA013")]
public string? Caa013 { get; set; }
/// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "CAA015")]
public string? Caa015 { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "CAA016")]
public string? Caa016 { get; set; }
/// <summary>
- /// 宸叉帓鏁伴噺锛堝純鐢級
- /// </summary>
+ /// 宸叉帓鏁伴噺锛堝純鐢級
+ ///</summary>
[SugarColumn(ColumnName = "CAA017")]
public int? Caa017 { get; set; }
/// <summary>
- /// ERP鐢熶骇璁㈠崟ID
- /// </summary>
+ /// ERP鐢熶骇璁㈠崟ID
+ ///</summary>
[SugarColumn(ColumnName = "CAA018")]
public int? Caa018 { get; set; }
/// <summary>
- /// ERP鐢熶骇璁㈠崟搴忓彿
- /// </summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿
+ ///</summary>
[SugarColumn(ColumnName = "CAA019")]
public int? Caa019 { get; set; }
/// <summary>
- /// ERP鐢熶骇璁㈠崟鍗曞彿
- /// </summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "CAA020")]
public string? Caa020 { get; set; }
/// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
[SugarColumn(ColumnName = "CAA021")]
public string? Caa021 { get; set; }
/// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
+ /// 瀹℃牳鐮�
+ ///</summary>
[SugarColumn(ColumnName = "FSTATUS")]
public int? Fstatus { get; set; }
/// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 瀹℃牳浜�
- /// </summary>
+ /// 瀹℃牳浜�
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_USER")]
public string? CheckUser { get; set; }
/// <summary>
- /// 鏈帓鏁伴噺锛堝純鐢級
- /// </summary>
+ /// 鏈帓鏁伴噺锛堝純鐢級
+ ///</summary>
[SugarColumn(ColumnName = "CAA022")]
public int? Caa022 { get; set; }
/// <summary>
- /// 涓氬姟鐘舵��("1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�")
- /// </summary>
+ /// 涓氬姟鐘舵��("1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�")
+ ///</summary>
[SugarColumn(ColumnName = "CAA023")]
public string? Caa023 { get; set; }
/// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
+ /// 宸插叆搴撴暟閲�
+ ///</summary>
[SugarColumn(ColumnName = "CAA024")]
public int? Caa024 { get; set; }
/// <summary>
- /// 宸ヨ壓璺嚎
- /// </summary>
+ /// 宸ヨ壓璺嚎
+ ///</summary>
[SugarColumn(ColumnName = "ROUTING_ID")]
public string? RoutingId { get; set; }
/// <summary>
- /// 浜х嚎
- /// </summary>
+ /// 浜х嚎
+ ///</summary>
[SugarColumn(ColumnName = "WORK_SHOP_ID")]
public string? WorkShopId { get; set; }
/// <summary>
- /// 浠撳簱
- /// </summary>
+ /// 浠撳簱
+ ///</summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
public string? DepotCode { get; set; }
/// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
+ /// 鍗曟嵁鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
+ public DateTime? CreateDate { get; set; }
/// <summary>
- /// 璁″垝缁�
- /// </summary>
+ /// 璁″垝缁�
+ ///</summary>
[SugarColumn(ColumnName = "WORK_GROUP_ID")]
public string? WorkGroupId { get; set; }
/// <summary>
- /// 璁″垝鍛�
- /// </summary>
+ /// 璁″垝鍛�
+ ///</summary>
[SugarColumn(ColumnName = "PLAN_ID")]
public string? PlanId { get; set; }
/// <summary>
- /// 鍏ュ簱涓婇檺
- /// </summary>
+ /// 鍏ュ簱涓婇檺
+ ///</summary>
[SugarColumn(ColumnName = "STOCK_INLIMITH")]
public string? StockInlimith { get; set; }
/// <summary>
- /// 鍏ュ簱涓嬮檺
- /// </summary>
+ /// 鍏ュ簱涓嬮檺
+ ///</summary>
[SugarColumn(ColumnName = "STOCK_INLIMITL")]
public string? StockInlimitl { get; set; }
/// <summary>
- /// 涓昏溅闂磋皟搴﹀崟
- /// </summary>
+ /// 涓昏溅闂磋皟搴﹀崟
+ ///</summary>
[SugarColumn(ColumnName = "MTONO")]
public string? Mtono { get; set; }
/// <summary>
- /// 鎵规
- /// </summary>
+ /// 鎵规
+ ///</summary>
[SugarColumn(ColumnName = "LOT")]
public string? Lot { get; set; }
/// <summary>
- /// 寮曠敤鍗曞彿
- /// </summary>
+ /// 寮曠敤鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "CAA015_HEAD")]
public string? Caa015Head { get; set; }
/// <summary>
- /// 鍒跺崟绫诲瀷
- /// </summary>
+ /// 鍒跺崟绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "CREATE_TYPE")]
public string? CreateType { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
- /// </summary>
+ /// 鏉ユ簮鍗曟嵁绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "SRC_BILL_TYPE")]
public string? SrcBillType { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
+ /// 鏉ユ簮鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "SRC_BILL_NO")]
public string? SrcBillNo { get; set; }
/// <summary>
- /// 鏉ユ簮琛屽彿
- /// </summary>
+ /// 鏉ユ簮琛屽彿
+ ///</summary>
[SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
public string? SrcBillentryseq { get; set; }
/// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "SALE_ORDER_NO")]
public string? SaleOrderNo { get; set; }
/// <summary>
- /// 閿�鍞鍗曡鍙�
- /// </summary>
+ /// 閿�鍞鍗曡鍙�
+ ///</summary>
[SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
public string? SaleOrderEntryseq { get; set; }
/// <summary>
- /// 寮哄埗鍏抽棴浜�
- /// </summary>
+ /// 寮哄埗鍏抽棴浜�
+ ///</summary>
[SugarColumn(ColumnName = "FORCE_CLOSERID")]
public string? ForceCloserid { get; set; }
/// <summary>
- /// 鍏抽棴绫诲瀷
- /// </summary>
+ /// 鍏抽棴绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "CLOSE_TYPE")]
public string? CloseType { get; set; }
/// <summary>
- /// 鍒嗗崟鍙�
- /// </summary>
+ /// 鍒嗗崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
public string? SrcSplitBillno { get; set; }
/// <summary>
- /// 鏄惁绠℃帶
- /// </summary>
+ /// 鐢熶骇缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "ERP_SCZZ")]
public int? ErpSczz { get; set; }
/// <summary>
- /// 鏄惁濮旀墭
- /// </summary>
+ /// 濮旀墭缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "ERP_WTZZ")]
public int? ErpWtzz { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
public string? MainProductNo { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
public int? MainProductQty { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
public string? CustomerItemNumber { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
public string? PackingListNumber { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "CUSTOMER_NAME")]
public string? CustomerName { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "CUSTOMER")]
public string? Customer { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "TYPE")]
public string? Type { get; set; }
/// <summary>
- /// </summary>
+ /// 缁撴鏍囪瘑
+ ///</summary>
[SugarColumn(ColumnName = "JA_BS")]
public string? JaBs { get; set; }
/// <summary>
- /// </summary>
+ /// 缁撴鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "JA_TIME")]
public DateTime? JaTime { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "YP_NUM")]
public int? YpNum { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "CAA011_1")]
public string? Caa0111 { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "ERP_GYZZ")]
public int? ErpGyzz { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "ERP_FLZZ")]
public int? ErpFlzz { get; set; }
/// <summary>
- /// 鏄惁鍏ュ簱
- /// </summary>
+ /// 鏄惁鍏ュ簱
+ ///</summary>
[SugarColumn(ColumnName = "ERP_SLZZ")]
public int? ErpSlzz { get; set; }
/// <summary>
- /// 鏄惁閫�搴�
- /// </summary>
+ /// 鏄惁閫�搴�
+ ///</summary>
[SugarColumn(ColumnName = "ERP_RKZZ")]
public int? ErpRkzz { get; set; }
/// <summary>
- /// 鏄惁鎹㈣揣
- /// </summary>
+ /// 鏄惁鎹㈣揣
+ ///</summary>
[SugarColumn(ColumnName = "ERP_RKHZ")]
public int? ErpRkhz { get; set; }
/// <summary>
- /// 鏄惁瀵勫敭
- /// </summary>
+ /// 鏄惁瀵勫敭
+ ///</summary>
[SugarColumn(ColumnName = "ERP_JJDS")]
public int? ErpJjds { get; set; }
/// <summary>
- /// 鏄惁鎸夋
- /// </summary>
+ /// 鏄惁鎸夋
+ ///</summary>
[SugarColumn(ColumnName = "ERP_BZDS")]
public int? ErpBzds { get; set; }
/// <summary>
- /// 鏄惁鏂板缓
- /// </summary>
+ /// 鏄惁鏂板缓
+ ///</summary>
[SugarColumn(ColumnName = "CAA025")]
public int? Caa025 { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟鍙�
- /// </summary>
+ /// 閲囪喘璁㈠崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "FPURORDERNO")]
public string? Fpurorderno { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ ///</summary>
[SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
public string? Fpurorderentryseq { get; set; }
/// <summary>
- /// 澶囨敞锛堣〃浣擄級
- /// </summary>
+ /// 澶囨敞锛堣〃浣擄級
+ ///</summary>
[SugarColumn(ColumnName = "Btbz")]
public string? Btbz { get; set; }
/// <summary>
- /// 婧愭媶鍒嗚鍗曠紪鍙�
- /// </summary>
+ /// 婧愭媶鍒嗚鍗曠紪鍙�
+ ///</summary>
[SugarColumn(ColumnName = "fmoentryid")]
public string? Fmoentryid { get; set; }
/// <summary>
- /// 鎺掍骇绾垮埆
- /// </summary>
+ /// 鎺掍骇绾垮埆
+ ///</summary>
[SugarColumn(ColumnName = "prod_line")]
public string? ProdLine { get; set; }
/// <summary>
- /// 1锛屾柊澧烇紱2锛屽彉鏇�
- /// </summary>
+ /// 1锛屾柊澧烇紱2锛屽彉鏇� ;3, 鍙嶅鏍�
+ ///</summary>
[SugarColumn(ColumnName = "TYPEA")]
public string? Typea { get; set; }
/// <summary>
- /// 鍚屾鏃堕棿
- /// </summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "ORDER_NO_SUB")]
+ public string? OrderNoSub { get; set; }
+
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
public DateTime? SynchronousDate { get; set; }
/// <summary>
- /// 姝ｈ埅閿�鍞鍗曞彿(榫欏穽)
- /// </summary>
- [SugarColumn(ColumnName = "ZH_XSDD")]
- public string? ZH_XSDD { get; set; }
+ /// d
+ ///</summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 64ed4b6..308b191 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -9,253 +9,249 @@
public class Womcab
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// ERPID
- /// </summary>
+ /// ERPID
+ ///</summary>
[SugarColumn(ColumnName = "ERPID")]
public int? Erpid { get; set; }
/// <summary>
- /// 宸ュ崟鍗曞彿
- /// </summary>
+ /// 宸ュ崟鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "CAB001")]
- public string Cab001 { get; set; }
+ public string? Cab001 { get; set; }
/// <summary>
- /// 搴忓彿
- /// </summary>
+ /// 搴忓彿
+ ///</summary>
[SugarColumn(ColumnName = "CAB002")]
public int? Cab002 { get; set; }
/// <summary>
- /// 鏉愭枡缂栫爜
- /// </summary>
+ /// 鏉愭枡缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "CAB003")]
- public string Cab003 { get; set; }
+ public string? Cab003 { get; set; }
/// <summary>
- /// 闇�棰嗙敤閲�
- /// </summary>
+ /// 闇�棰嗙敤閲�
+ ///</summary>
[SugarColumn(ColumnName = "CAB006")]
public decimal? Cab006 { get; set; }
/// <summary>
- /// 宸查鐢ㄩ噺
- /// </summary>
+ /// 宸查鐢ㄩ噺
+ ///</summary>
[SugarColumn(ColumnName = "CAB007")]
public decimal? Cab007 { get; set; }
/// <summary>
- /// 宸ヨ壓
- /// </summary>
+ /// 宸ヨ壓
+ ///</summary>
[SugarColumn(ColumnName = "CAB008")]
- public string Cab008 { get; set; }
+ public string? Cab008 { get; set; }
/// <summary>
- /// 鍗曚綅
- /// </summary>
+ /// 鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "CAB009")]
- public string Cab009 { get; set; }
+ public string? Cab009 { get; set; }
/// <summary>
- /// 缁勬垚鐢ㄩ噺
- /// </summary>
+ /// 缁勬垚鐢ㄩ噺
+ ///</summary>
[SugarColumn(ColumnName = "CAB012")]
public decimal? Cab012 { get; set; }
/// <summary>
- /// 鏄惁鏇挎枡
- /// </summary>
+ /// 鏄惁鏇挎枡
+ ///</summary>
[SugarColumn(ColumnName = "CAB014")]
- public string Cab014 { get; set; }
+ public string? Cab014 { get; set; }
/// <summary>
- /// PID
- /// </summary>
+ /// PID
+ ///</summary>
[SugarColumn(ColumnName = "PID")]
public int? Pid { get; set; }
/// <summary>
- /// ERP澶碔D
- /// </summary>
+ /// ERP澶碔D
+ ///</summary>
[SugarColumn(ColumnName = "EID")]
public int? Eid { get; set; }
/// <summary>
- /// 浣嶇疆鍙�
- /// </summary>
+ /// 浣嶇疆鍙�
+ ///</summary>
[SugarColumn(ColumnName = "POSITION_NO")]
- public string PositionNo { get; set; }
+ public string? PositionNo { get; set; }
/// <summary>
- /// 鍙戞枡缁勭粐
- /// </summary>
+ /// 鍙戞枡缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
- public string IssuingOrganization { get; set; }
+ public string? IssuingOrganization { get; set; }
/// <summary>
- /// 渚涘簲缁勭粐
- /// </summary>
+ /// 渚涘簲缁勭粐
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
- public string SupplyOrganization { get; set; }
+ public string? SupplyOrganization { get; set; }
/// <summary>
- /// 璐т富
- /// </summary>
+ /// 璐т富
+ ///</summary>
[SugarColumn(ColumnName = "OWNER_ID")]
- public string OwnerId { get; set; }
+ public string? OwnerId { get; set; }
/// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
[SugarColumn(ColumnName = "MTONO")]
- public string Mtono { get; set; }
+ public string? Mtono { get; set; }
/// <summary>
- /// 鎵瑰彿
- /// </summary>
+ /// 鎵瑰彿
+ ///</summary>
[SugarColumn(ColumnName = "LOT")]
- public string Lot { get; set; }
+ public string? Lot { get; set; }
/// <summary>
- /// 浠撳簱
- /// </summary>
+ /// 浠撳簱
+ ///</summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string DepotCode { get; set; }
+ public string? DepotCode { get; set; }
/// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
+ /// 鍙戞枡鏂瑰紡
+ ///</summary>
[SugarColumn(ColumnName = "ISSUE_TYPE")]
- public string IssueType { get; set; }
+ public string? IssueType { get; set; }
/// <summary>
- /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
- /// </summary>
+ /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
+ ///</summary>
[SugarColumn(ColumnName = "SUPPLY_TYPE")]
- public string SupplyType { get; set; }
+ public string? SupplyType { get; set; }
/// <summary>
- /// 鍒嗗瓙
- /// </summary>
+ /// 鍒嗗瓙
+ ///</summary>
[SugarColumn(ColumnName = "NUMERATOR")]
- public string Numerator { get; set; }
+ public string? Numerator { get; set; }
/// <summary>
- /// 鍒嗘瘝
- /// </summary>
+ /// 鍒嗘瘝
+ ///</summary>
[SugarColumn(ColumnName = "DENOMINATOR")]
- public string Denominator { get; set; }
+ public string? Denominator { get; set; }
/// <summary>
- /// 鍥哄畾鎹熻��
- /// </summary>
+ /// 鍥哄畾鎹熻��
+ ///</summary>
[SugarColumn(ColumnName = "SCRAPQTY")]
- public string Scrapqty { get; set; }
+ public string? Scrapqty { get; set; }
/// <summary>
- /// 鍙樺姩鎹熻�楃巼
- /// </summary>
+ /// 鍙樺姩鎹熻�楃巼
+ ///</summary>
[SugarColumn(ColumnName = "SCRAPRATE")]
- public string Scraprate { get; set; }
+ public string? Scraprate { get; set; }
/// <summary>
- /// 瀹㈡埛璐у彿
- /// </summary>
+ /// 瀹㈡埛璐у彿
+ ///</summary>
[SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
- public string CustomerItemNumber { get; set; }
+ public string? CustomerItemNumber { get; set; }
/// <summary>
- /// 鍖呰鍗曞彿
- /// </summary>
+ /// 鍖呰鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
- public string PackingListNumber { get; set; }
+ public string? PackingListNumber { get; set; }
/// <summary>
- /// 涓讳骇鍝�
- /// </summary>
+ /// 涓讳骇鍝�
+ ///</summary>
[SugarColumn(ColumnName = "MAIN_PRODUCT")]
- public string MainProduct { get; set; }
+ public string? MainProduct { get; set; }
/// <summary>
- /// 涓讳骇鍝佹暟閲�
- /// </summary>
+ /// 涓讳骇鍝佹暟閲�
+ ///</summary>
[SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
public int? MainProductQty { get; set; }
/// <summary>
- /// 鐖堕」鐗╂枡鍚嶇О
- /// </summary>
+ /// 鐖堕」鐗╂枡鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
- public string ParentItemName { get; set; }
+ public string? ParentItemName { get; set; }
/// <summary>
- /// 閿�鍞鍗�
- /// </summary>
+ /// 閿�鍞鍗�
+ ///</summary>
[SugarColumn(ColumnName = "FSALEORDERNO")]
- public string Fsaleorderno { get; set; }
+ public string? Fsaleorderno { get; set; }
/// <summary>
- /// 璐т富绫诲瀷
- /// </summary>
+ /// 璐т富绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "FOWNERTYPEID")]
- public string Fownertypeid { get; set; }
+ public string? Fownertypeid { get; set; }
/// <summary>
- /// 椤规鍙�
- /// </summary>
+ /// 椤规鍙�
+ ///</summary>
[SugarColumn(ColumnName = "FREPLACEGROUP")]
public int? Freplacegroup { get; set; }
/// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "ERP_XSDDH")]
- public string ErpXsddh { get; set; }
+ public string? ErpXsddh { get; set; }
/// <summary>
- /// 瀛愰」绫诲瀷
- /// </summary>
+ /// 瀛愰」绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "FMATERIALTYPE")]
- public string Fmaterialtype { get; set; }
+ public string? Fmaterialtype { get; set; }
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
[SugarColumn(ColumnName = "FUNITID")]
- public string Funitid { get; set; }
+ public string? Funitid { get; set; }
/// <summary>
- /// 搴斿彂鏁伴噺
- /// </summary>
+ /// 搴斿彂鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "Must_Qty")]
public decimal? MustQty { get; set; }
/// <summary>
- /// 浣跨敤姣斾緥锛�%锛�
- /// </summary>
+ /// 浣跨敤姣斾緥锛�%锛�
+ ///</summary>
[SugarColumn(ColumnName = "Use_Rate")]
public decimal? UseRate { get; set; }
/// <summary>
- /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
- /// </summary>
+ /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ ///</summary>
[SugarColumn(ColumnName = "Material_Type")]
- public string MaterialType { get; set; }
+ public string? MaterialType { get; set; }
/// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
+ /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+ ///</summary>
[SugarColumn(ColumnName = "TYPEB")]
public string? Typeb { get; set; }
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "LW_WLBGY")]
- public string? LW_WLBGY { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index ff6b3f2..3a0dcec 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -57,17 +57,17 @@
int update = 0;
int insertOrUpdate = 0;
- if (mesSalesOrder.ErpID != null)
+ if (mesSalesOrder.ErpId != null)
{
update = db.Deleteable<SalesOrder>()
- .Where(s => s.ErpID == mesSalesOrder.ErpID)
+ .Where(s => s.ErpId == mesSalesOrder.ErpId)
.ExecuteCommand();
}
- if (mesSalesOrderDatas.Count > 0 && mesSalesOrder.ErpID != null)
+ if (mesSalesOrderDatas.Count > 0 && mesSalesOrder.ErpId != null)
{
insertOrUpdate = db.Deleteable<SalesOrderDetail>()
- .Where(s => s.EHID == mesSalesOrder.ErpID)
+ .Where(s => s.EHid == mesSalesOrder.ErpId)
.ExecuteCommand();
}
@@ -86,13 +86,13 @@
{
//if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
- if (mesSalesOrder.ErpID != null)
+ if (mesSalesOrder.ErpId != null)
db.Deleteable<SalesOrder>()
- .Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();
+ .Where(s => s.ErpId == mesSalesOrder.ErpId).ExecuteCommand();
if (mesSalesOrderDatas.Count > 0)
db.Deleteable<SalesOrderDetail>()
- .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+ .Where(s => s.EHid == mesSalesOrder.ErpId).ExecuteCommand();
//var orUpdate = base.Insert(mesSalesOrder);
//var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
@@ -138,7 +138,7 @@
{
Id = Guid.NewGuid(),
BillNo = erpDto.FBillNo,
- ErpID = Convert.ToDecimal(erpDto.ErpID),
+ ErpId = Convert.ToDecimal(erpDto.ErpID),
FDate = ParseDateTime(erpDto.FDate) ?? null,
BillTypeId = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
DocumentStatus = erpDto.FDocumentStatus, // 鍗曟嵁鐘舵��
@@ -180,7 +180,9 @@
: null, // 鍙樻洿鏃ユ湡
CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
- VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
+ VersionNo = !string.IsNullOrEmpty(erpDto.FVersionNo)
+ ? Convert.ToInt32(erpDto.FVersionNo)
+ : 0, // 鐗堟湰鍙�
ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
SynchronousDate = DateTime.Now
//EntryNote = erpDto.FEntryNote // 澶囨敞
@@ -195,8 +197,37 @@
? (DateTime?)null
: DateTime.ParseExact(erpDto.FCloseDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
- var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ var single = base.GetSingle(it => it.ErpId == Convert.ToDecimal(erpDto.ErpID));
if (single != null) salesOrder.Id = single.Id;
+
+ // CUST_ID => MES_CUSTOMER.id
+ if (!string.IsNullOrEmpty(salesOrder.CustId))
+ {
+ var customer = Db.Queryable<MesCustomer>()
+ .Where(c => c.CustNo == salesOrder.CustId)
+ .Select(c => c.Id)
+ .First();
+ if (customer != null)
+ {
+ salesOrder.CustId = customer.ToString();
+ }
+ }
+
+ // SALE_DEPT_ID => SYS_DEPARTMENT.id
+ if (!string.IsNullOrEmpty(salesOrder.SaleDeptId))
+ {
+ var department = Db.Queryable<SysDepartment>()
+ .Where(d => d.Departmentcode == salesOrder.SaleDeptId)
+ .Select(d => d.Id)
+ .First();
+ if (department != null)
+ {
+ salesOrder.SaleDeptId = department.ToString();
+ }
+ }
+
+ // SALE_ORG_ID => 1 (鍥哄畾鍊�)
+ salesOrder.SaleOrgId = "1";
return salesOrder;
}
@@ -213,18 +244,30 @@
var salesOrderSub = new SalesOrderDetail
{
Pid = salesOrder.Id,
- ErpID = Convert.ToDecimal(erpDto.ErpID),
- EHID = Convert.ToDecimal(erpDto.EHID),
+ ErpId = !string.IsNullOrEmpty(erpDto.ErpID)
+ ? Convert.ToInt32(erpDto.ErpID)
+ : 0,
+ EHid = !string.IsNullOrEmpty(erpDto.EHID)
+ ? Convert.ToInt32(erpDto.EHID)
+ : 0,
MaterialId = erpDto.FMaterialId,
MapId = erpDto.FMapId,
MapName = erpDto.FMapName,
MapSpec = erpDto.FMapSpec,
- Seq = Convert.ToInt32(erpDto.Seq),
+ Seq = !string.IsNullOrEmpty(erpDto.Seq)
+ ? Convert.ToInt32(erpDto.Seq)
+ : 0,
UnitId = erpDto.FUnitID,
- Qty = Convert.ToDecimal(erpDto.FQty),
+ Qty = !string.IsNullOrEmpty(erpDto.FQty)
+ ? Convert.ToDecimal(erpDto.FQty)
+ : 0,
PriceUnitId = erpDto.FPriceUnitId,
- PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
- DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
+ PriceUnitQty = !string.IsNullOrEmpty(erpDto.FPriceUnitQty)
+ ? Convert.ToDecimal(erpDto.FPriceUnitQty)
+ : 0,
+ DeliveryDate = !string.IsNullOrEmpty(erpDto.FDeliveryDate)
+ ? Convert.ToDateTime(erpDto.FDeliveryDate)
+ : DateTime.MinValue,
IsFree = erpDto.FIsFree,
SupplyOrgId = erpDto.FSupplyOrgId,
StockOrgId = erpDto.FStockOrgId,
@@ -236,8 +279,12 @@
EntryNote = erpDto.FEntryNote,
MtoNo = erpDto.FMtoNo,
Lot = erpDto.FLot,
- DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
- DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
+ DeliveryMaxQty = !string.IsNullOrEmpty(erpDto.FDeliveryMaxQty)
+ ? Convert.ToDecimal(erpDto.FDeliveryMaxQty)
+ : 0,
+ DeliveryMinQty = !string.IsNullOrEmpty(erpDto.FDeliveryMinQty)
+ ? Convert.ToDecimal(erpDto.FDeliveryMinQty)
+ : 0,
OutLmtUnitId = erpDto.FOutLmtUnitID,
MrpCloseStatus = erpDto.FMrpCloseStatus,
MrpTerminateStatus = erpDto.FMrpTerminateStatus,
@@ -245,13 +292,24 @@
TerminaterId = erpDto.FTerminatorId,
SrcType = erpDto.FSrcType,
SrcBillNo = erpDto.FSrcBillNo,
- DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
- StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
- BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
- BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
- BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
- BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
-
+ DeliQty = !string.IsNullOrEmpty(erpDto.FDeliQty)
+ ? Convert.ToDecimal(erpDto.FDeliQty)
+ : 0,
+ StockOutQty = !string.IsNullOrEmpty(erpDto.FStockOutQty)
+ ? Convert.ToDecimal(erpDto.FStockOutQty)
+ : 0,
+ BaseRetNoticeQty = !string.IsNullOrEmpty(erpDto.FBaseRetNoticeQty)
+ ? Convert.ToDecimal(erpDto.FBaseRetNoticeQty)
+ : 0,
+ BaseReturnQty = !string.IsNullOrEmpty(erpDto.FBaseReturnQty)
+ ? Convert.ToDecimal(erpDto.FBaseReturnQty)
+ : 0,
+ BaseRemainOutQty = !string.IsNullOrEmpty(erpDto.FBaseRemainOutQty)
+ ? Convert.ToDecimal(erpDto.FBaseRemainOutQty)
+ : 0,
+ Basearqty = !string.IsNullOrEmpty(erpDto.FBASEARQTY)
+ ? Convert.ToDecimal(erpDto.FBASEARQTY)
+ : 0,
};
if (!string.IsNullOrEmpty(salesOrderSub.TerminaterId))
@@ -260,9 +318,70 @@
: DateTime.ParseExact(erpDto.FTerminateDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
var single = _SalesOrderDetailManager.GetSingle(it =>
- it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ it.ErpId == Convert.ToDecimal(salesOrderSub.ErpId));
if (single != null) salesOrderSub.Id = single.Id;
+ // material_id => MES_ITEMS.id
+ if (!string.IsNullOrEmpty(salesOrderSub.MaterialId))
+ {
+ var item = Db.Queryable<MesItems>()
+ .Where(i => i.ItemNo == salesOrderSub.MaterialId)
+ .Select(i => i.Id)
+ .First();
+ if (item != null)
+ {
+ salesOrderSub.MaterialId = item.ToString();
+ }
+ }
+
+ // UNIT_ID => MES_UNIT.id
+ if (!string.IsNullOrEmpty(salesOrderSub.UnitId))
+ {
+ var unit = Db.Queryable<MesUnit>()
+ .Where(u => u.Fnumber == salesOrderSub.UnitId)
+ .Select(u => u.Id)
+ .First();
+ if (unit != null)
+ {
+ salesOrderSub.UnitId = unit.ToString();
+ }
+ }
+
+ // PRICE_UNIT_ID => MES_UNIT.id
+ if (!string.IsNullOrEmpty(salesOrderSub.PriceUnitId))
+ {
+ var priceUnit = Db.Queryable<MesUnit>()
+ .Where(u => u.Fnumber == salesOrderSub.PriceUnitId)
+ .Select(u => u.Id)
+ .First();
+ if (priceUnit != null)
+ {
+ salesOrderSub.PriceUnitId = priceUnit.ToString();
+ }
+ }
+
+ // OUT_LMT_UNIT_ID => MES_UNIT.id
+ if (!string.IsNullOrEmpty(salesOrderSub.OutLmtUnitId))
+ {
+ var outLmtUnit = Db.Queryable<MesUnit>()
+ .Where(u => u.Fnumber == salesOrderSub.OutLmtUnitId)
+ .Select(u => u.Id)
+ .First();
+ if (outLmtUnit != null)
+ {
+ salesOrderSub.OutLmtUnitId = outLmtUnit.ToString();
+ }
+ }
+
+ // SUPPLY_ORG_ID => 1 (鍥哄畾鍊�)
+ salesOrderSub.SupplyOrgId = "1";
+
+ // STOCK_ORG_ID => 1 (鍥哄畾鍊�)
+ salesOrderSub.StockOrgId = "1";
+
+ // SETTLE_ORG_IDS => 1 (鍥哄畾鍊�)
+ salesOrderSub.SettleOrgIds = "1";
+
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 1113a5f..62c68a4 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -1,4 +1,6 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Globalization;
+using Masuit.Tools;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
@@ -111,7 +113,6 @@
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
DepotCode = dto.FStockId, /// 浠撳簱
- CreateDate = dto.FDate, /// 鍗曟嵁鏃ユ湡
Caa004 = dto.FBILLTYPE, /// 鍗曟嵁绫诲瀷
Caa023 = dto.FStatus, /// 鐘舵�� 瀹屽伐锛屾湭瀹屽伐
Caa006 = dto.FMaterialId, /// 浜у搧缂栫爜
@@ -151,9 +152,9 @@
: null, /// ERP婧愬崟琛屽彿
Caa020 = dto.PLAN_NUM, /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
//Caa015 = dto.F_UNW_Text_xsddh, /// 閿�鍞鍗曞彿
- ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// 鐢熶骇缁勭粐ID
- ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), /// 濮旀墭缁勭粐ID
- Btbz = dto.Btbz, /// 濮旀墭缁勭粐ID
+ // ErpSczz = Convert.ToInt32(dto.FPrdOrgId), /// 鐢熶骇缁勭粐ID
+ // ErpWtzz = Convert.ToInt32(dto.FEnTrustOrgId), /// 濮旀墭缁勭粐ID
+ // Btbz = dto.Btbz, /// 濮旀墭缁勭粐ID
//Caa015Head = dto.F_XIFG_Integer_tzk, /// 閿�鍞鍗曡鍙�
//MainProductNo = dto.F_XIFG_Base_w5c, /// 涓讳骇鍝佺紪鐮�
// MainProductQty =
@@ -165,8 +166,7 @@
Caa0111 = dto.FPlanFinishDate, /// 棰勮瀹屽伐鏃堕棿澶囦唤
Typea = dto.TypeA, /// 棰勮瀹屽伐鏃堕棿澶囦唤
//Typeb = dto.TypeB /// 棰勮瀹屽伐鏃堕棿澶囦唤
- SynchronousDate = DateTime.Now,
- ZH_XSDD = dto.F_WPVT_TEXT_CA9
+ SynchronousDate = DateTime.Now
};
@@ -219,6 +219,24 @@
.First();
entity.Caa009 = unit.ToString();
}
+
+ //CreateDate = dto.FDate, /// 鍗曟嵁鏃ユ湡
+ if (!dto.FDate.IsNullOrEmpty())
+ {
+ if (!DateTime.TryParseExact(dto.FDate, "yyyy-MM-d H:m:s",
+ CultureInfo.InvariantCulture,
+ DateTimeStyles.None, out DateTime createDate))
+ {
+ throw new FormatException(
+ $"鍒涘缓鏃ユ湡锛團CreateDate锛夎В鏋愬け璐ワ紒鍊硷細銆恵dto.FDate}銆戯紝鏀寔鏍煎紡锛歽yyy-MM-d H:m:s");
+ }
+
+ entity.CreateDate = createDate;
+ }
+ else
+ {
+ entity.CreateDate = null;
+ }
return entity;
}
@@ -261,14 +279,19 @@
Pid = Convert.ToInt32(dto.PID), /// ERP澶碔D
Eid = Convert.ToInt32(dto.Id), /// ERP ID
- Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
+ Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
- Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
- UseRate = Convert.ToDecimal(dto.FUseRate),
+ Freplacegroup = !string.IsNullOrEmpty(dto.FReplaceGroup)
+ ? Convert.ToInt32(dto.FReplaceGroup)
+ : 0,
+ UseRate = !string.IsNullOrEmpty(dto.FUseRate)
+ ? Convert.ToDecimal(dto.FUseRate)
+ : 0,
MaterialType = dto.FMaterialType,
- MustQty = Convert.ToDecimal(dto.FMustQty),
- Typeb = dto.TypeB,
- LW_WLBGY = dto.F_WPVT_TEXT_RE5
+ MustQty = !string.IsNullOrEmpty(dto.FMustQty)
+ ? Convert.ToDecimal(dto.FMustQty)
+ : 0,
+ Typeb = dto.TypeB
// Fsaleorderno = dto.FSALEORDERNO, /// 閿�鍞鍗�
//
// CustomerItemNumber = dto.F_XIFG_Text_re5, /// 瀹㈡埛璐у彿
@@ -283,6 +306,51 @@
.Where(s => s.Eid == womcab.Eid).Single();
if (entity != null) womcab.Guid = entity.Guid;
+ // CAB003 鏉愭枡缂栫爜 => MES_ITEMS.id
+ if (!string.IsNullOrEmpty(womcab.Cab003))
+ {
+ var item = Db.Queryable<MesItems>()
+ .Where(i => i.ItemNo == womcab.Cab003)
+ .Select(i => i.Id)
+ .First();
+ if (item != null)
+ {
+ womcab.Cab003 = item.ToString();
+ }
+ }
+
+ // CAB009 鍗曚綅 => MES_UNIT.id
+ if (!string.IsNullOrEmpty(womcab.Cab009))
+ {
+ var unit = Db.Queryable<MesUnit>()
+ .Where(u => u.Fnumber == womcab.Cab009)
+ .Select(u => u.Id)
+ .First();
+ if (unit != null)
+ {
+ womcab.Cab009 = unit.ToString();
+ }
+ }
+
+ // DEPOT_CODE 浠撳簱 => MES_DEPOTS.DEPOT_ID
+ if (!string.IsNullOrEmpty(womcab.DepotCode))
+ {
+ var depot = Db.Queryable<MesDepots>()
+ .Where(d => d.DepotCode == womcab.DepotCode)
+ .Select(d => d.DepotId)
+ .First();
+ if (depot != null)
+ {
+ womcab.DepotCode = depot.ToString();
+ }
+ }
+
+ // ISSUING_ORGANIZATION 鍙戞枡缁勭粐 => 1 (鍥哄畾鍊�)
+ womcab.IssuingOrganization = "1";
+
+ // SUPPLY_ORGANIZATION 渚涘簲缁勭粐 => 1 (鍥哄畾鍊�)
+ womcab.SupplyOrganization = "1";
+
womcabList.Add(womcab);
}
--
Gitblit v1.9.3