From 9e9dbf388afbdad4d57ecb7b0e21b7d521177034 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 14 五月 2025 13:07:43 +0800
Subject: [PATCH] 采购订单出版
---
StandardInterface/MES.Service/Modes/Womcab.cs | 593 ++++++++++---------
StandardInterface/MES.Service/Modes/Womcaa.cs | 860 ++++++++++++++---------------
StandardInterface/MES.Service/service/WomcaaWWManager.cs | 10
StandardInterface/MES.Service/service/WomcaaManager.cs | 72 +-
StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs | 42
StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs | 88 +-
StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs | 66 +-
7 files changed, 879 insertions(+), 852 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs b/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
index 511cfeb..c9c0002 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
@@ -4,50 +4,51 @@
{
public string? Id { get; set; }
public string? Type { get; set; }
- public string? FBillNo { get; set; }
- public string? FWorkShopID { get; set; }
- public string? FRoutingId { get; set; }
- public string? FREMWorkShopId { get; set; }
- public string? FStockId { get; set; }
- public string? FDate { get; set; }
- public string? FBillType { get; set; }
- public string? FStatus { get; set; }
- public string? FMaterialId { get; set; }
- public string? FUnitId { get; set; }
- public string? FQty { get; set; }
- public string? FWorkGroupId { get; set; }
- public string? FPlannerID { get; set; }
- public string? FPlanStartDate { get; set; }
- public string? FPlanFinishDate { get; set; }
- public string? FConveyDate { get; set; }
- public string? FStockInLimitH { get; set; }
- public string? FStockInLimitL { get; set; }
- public string? FMTONO { get; set; }
- public string? FLot { get; set; }
+ public string? FBillNo { get; set; } // 鍗曟嵁缂栧彿
+ public string? FWorkShopID { get; set; } // 鐢熶骇杞﹂棿
+ public string? FRoutingId { get; set; } // 宸ヨ壓璺嚎
+ public string? FREMWorkShopId { get; set; } // 浜х嚎
+ public string? FStockId { get; set; } // 浠撳簱
+ public string? FDate { get; set; } // 鍗曟嵁鏃ユ湡
+ public string? FBillType { get; set; } // 鍗曟嵁绫诲瀷
+ public string? FStatus { get; set; } // 涓氬姟鐘舵��
+ public string? FMaterialId { get; set; } // 浜у搧缂栫爜
+ public string? FUnitId { get; set; } // 鍗曚綅
+ public string? FQty { get; set; } // 宸ュ崟鏁伴噺
+ public string? FWorkGroupId { get; set; } // 璁″垝缁�
+ public string? FPlannerID { get; set; } // 璁″垝鍛�
+ public string? FPlanStartDate { get; set; } // 棰勮寮�宸ユ椂闂�
+ public string? FPlanFinishDate { get; set; }// 棰勮瀹屽伐鏃堕棿
+ public string? FConveyDate { get; set; } // 璁″垝涓嬭揪鏃ユ湡
+ public string? FStockInLimitH { get; set; } // 鍏ュ簱涓婇檺
+ public string? FStockInLimitL { get; set; } // 鍏ュ簱涓嬮檺
+ public string? FMTONO { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } //鎵瑰彿
- public string? FBomId { get; set; }
-
- //public string? FXSHTH { get; set; }
- public string? FCreateType { get; set; }
- public string? PLAN_ID { get; set; }
- public string? PLAN_SEQ { get; set; }
- public string? PLAN_NUM { get; set; }
- public string? FSrcBillType { get; set; }
- public string? FSrcBillNo { get; set; }
- public string? FSrcBillEntrySeq { get; set; }
- public string? FSaleOrderNo { get; set; }
- public string? FSaleOrderEntrySeq { get; set; }
- public string? FForceCloserId { get; set; }
- public string? FCloseType { get; set; }
- public string? FSrcSplitBillNo { get; set; }
+ public string? FBomId { get; set; } //BOM鐗堟
+ public string? CAA015 { get; set; } //閿�鍞鍗曞彿
+ public string? CAA015_line { get; set; } //閿�鍞鍗曡鍙�
+ //public string? FXSHTH { get; set; }
+ public string? FCreateType { get; set; } //鐢熸垚鏂瑰紡
+ public string? PLAN_ID { get; set; } //ERP鐢熶骇璁㈠崟ID
+ public string? PLAN_SEQ { get; set; } //ERP鐢熶骇璁㈠崟搴忓彿
+ public string? PLAN_NUM { get; set; } //ERP鐢熶骇璁㈠崟鍗曞彿
+ public string? FSrcBillType { get; set; } //婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } //婧愬崟缂栫爜
+ public string? FSrcBillEntrySeq { get; set; } //婧愬崟鍒嗗綍琛屽彿
+ public string? FSaleOrderNo { get; set; } //闇�姹傚崟鎹彿
+ public string? FSaleOrderEntrySeq { get; set; } //闇�姹傚崟鎹鍙�
+ public string? FForceCloserId { get; set; } //缁撴浜�
+ public string? FCloseType { get; set; } //缁撴绫诲瀷
+ public string? FSrcSplitBillNo { get; set; } //婧愭媶鍒嗚鍗曠紪鍙�
//public string? erP_SCZZ { get; set; }
//public string? erP_WTZZ { get; set; }
//public string? F_ZJXF_YHRQ { get; set; }
//public string? F_ZSXG_KH { get; set; }
- public string? FDescription { get; set; }
+ public string? FDescription { get; set; }//鎺ュ彛鐘舵��
- public string? BTBZ { get; set; }
+ public string? BTBZ { get; set; } //澶囨敞
//public string? fsubentryid { get; set; }
//public string? FPurOrderNo { get; set; }
@@ -56,19 +57,22 @@
//public string? Caa025 { get; set; }
//public string? ErpRkhz { get; set; }
//public string? ErpRkzz { get; set; }
- public string? FPrdOrgId { get; set; }
- public string? FEnTrustOrgId { get; set; }
- public string? TypeA { get; set; }
+ public string? FPrdOrgId { get; set; } //鐢熶骇缁勭粐ID
+ public string? FEnTrustOrgId { get; set; } //濮旀墭缁勭粐ID
+ public string? TypeA { get; set; } //鍗曟嵁鐘舵��
+ public string? RK_ORG { get; set; } //鍏ュ簱缁勭粐
+ public string? RCN { get; set; } //鏃ヤ骇鑳�
+
////濮斿瀛楁
//public string? F_ZJXF_DATETIME_YHRQ { get; set; }
//public string? F_ZJXF_BASE_KH { get; set; }
//鏂板ppbom鎶曟枡鍗曞彿瀛楁
- public string? ppbombillno { get; set; }
+ // public string? ppbombillno { get; set; }
//娌冨皵鏂板 鐢熶骇閫氱煡鍗� 銆� 鍨嬪彿
- public string? F_SCDD_SCTZD { get; set; }
+ // public string? F_SCDD_SCTZD { get; set; }
// public string? F_SCDD_XH { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs b/StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs
index 5836176..25bf947 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs
@@ -2,40 +2,48 @@
public class ErpCAB
{
- public string? FBillNo { get; set; }
- public string? FSeq { get; set; }
- public string? FMaterialID { get; set; }
- public string? FNeedQty { get; set; }
- public string? FMustQty { get; set; }
- public string? FPickedQty { get; set; }
- public string? FPositionNO { get; set; }
- public string? FChildSupplyOrgId { get; set; }
- public string? FSupplyOrg { get; set; }
- public string? FOwnerID { get; set; }
- public string? FMTONO { get; set; }
- public string? FLot { get; set; }
- public string? FStockID { get; set; }
+ public string? FBillNo { get; set; }//鍗曟嵁缂栧彿
+ public string? FSeq { get; set; }//搴忓彿
+ public string? FMaterialID { get; set; }//瀛愰」鐗╂枡缂栫爜
+ public string? FNeedQty { get; set; }//闇�姹傛暟閲�
+ public string? FMustQty { get; set; }//搴斿彂鏁伴噺
+ public string? FPickedQty { get; set; }//宸查鏁伴噺
+ public string? FPositionNO { get; set; }//浣嶇疆鍙�
+ public string? FChildSupplyOrgId { get; set; }//渚涘簲缁勭粐
+ public string? FSupplyOrg { get; set; }//鍙戞枡缁勭粐
+ public string? FOwnerID { get; set; }//璐т富
+ public string? FMTONO { get; set; } //璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } //鎵瑰彿
+ public string? FStockID { get; set; } //浠撳簱
- public string? FIssueType { get; set; }
+ public string? FIssueType { get; set; }//鍙戞枡鏂瑰紡
//public string? BTBZ { get; set; }
- public string? FUnitID { get; set; }
- public string? FSupplyType { get; set; }
- public string? FStdQty { get; set; }
- public string? FReplaceGroup { get; set; }
- public string? FUseRate { get; set; }
- public string? FMaterialType { get; set; }
- public string? FIsKeyItem { get; set; }
- public string? FNumerator { get; set; }
- public string? FDenominator { get; set; }
- public string? PID { get; set; }
- public string? ID { get; set; }
+ public string? FUnitID { get; set; } //鍗曚綅
+ public string? FSupplyType { get; set; } //渚涘簲绫诲瀷
+ public string? FStdQty { get; set; } //鏍囧噯鐢ㄩ噺
+ // public string? FReplaceGroup { get; set; }
+ public string? FUseRate { get; set; } //浣跨敤姣斾緥
+ public string? FMaterialType { get; set; }//瀛愰」绫诲瀷
+ public string? FIsKeyItem { get; set; } //鏇夸唬涓绘枡
+ public string? FNumerator { get; set; } //鍒嗗瓙
+ public string? FDenominator { get; set; } //鍒嗘瘝
+ public string? ID { get; set; } //ERPID
+ public string? PID { get; set; } //ERP澶碔D
- public string? FFixScrapQty { get; set; }
- public string? FScrapRate { get; set; }
- public string? TypeB { get; set; }
+ public string? FFixScrapQty { get; set; }//鍥哄畾鎹熻��
+ public string? FScrapRate { get; set; } //鍙樺姩鎹熻�楃巼
+ //public string? TypeB { get; set; }
+ public string? WLSL { get; set; } //鏈鏁伴噺
+ public string? KWWLBM { get; set; } //瀹㈡埛鐗╂枡浠ｇ爜
+ public string? KHWLMC { get; set; } //瀹㈡埛鐗╂枡鍚嶇О
+ public string? XQZZ { get; set; } //闇�姹傜粍缁�
+ public string? XQBM { get; set; } //闇�姹傞儴闂�
+ public string? SLZZ { get; set; } //鏀舵枡缁勭粐
+ public string? SLBM { get; set; } //鏀舵枡閮ㄩ棬
- public string? F_XIFG_Base_qtr { get; set; }
+
+ //public string? F_XIFG_Base_qtr { get; set; }
//public string? F_XIFG_Base_83g { get; set; }
//public string? FSALEORDERNO { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/Womcaa.cs b/StandardInterface/MES.Service/Modes/Womcaa.cs
index 86b5acb..45b26b6 100644
--- a/StandardInterface/MES.Service/Modes/Womcaa.cs
+++ b/StandardInterface/MES.Service/Modes/Womcaa.cs
@@ -1,440 +1,424 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟琛�
-/// </summary>
-[SugarTable("WOMCAA")]
-public class Womcaa
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
{
/// <summary>
- /// 鑷鍒� SEQ_AOI
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
- OracleSequenceName = "SEQ_CAA")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
- public decimal? Erpid { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA001")]
- public string? Caa001 { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷 1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� SCDD03_SYS2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 SCDD04_SYS3銆佸伐搴忔眹鎶�-鏅�氱敓浜�
- /// SCDD01_SYS4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇 SCDD02_SYS
- /// </summary>
- [SugarColumn(ColumnName = "CAA004")]
- public string? Caa004 { get; set; }
-
- /// <summary>
- /// 寮�鍗曟棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "CAA005")]
- public string? Caa005 { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CAA006")]
- public string? Caa006 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAA009")]
- public string? Caa009 { get; set; }
-
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "CAA010")]
- public string? Caa010 { get; set; }
-
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA011")]
- public string? Caa011 { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA012")]
- public decimal? Caa012 { get; set; }
-
- /// <summary>
- /// BOM鐗堟
- /// </summary>
- [SugarColumn(ColumnName = "CAA013")]
- public string? Caa013 { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA015")]
- public string? Caa015 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "CAA016")]
- public string? Caa016 { get; set; }
-
- /// <summary>
- /// 宸叉帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA017")]
- public decimal? Caa017 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟ID
- /// </summary>
- [SugarColumn(ColumnName = "CAA018")]
- public decimal? Caa018 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA019")]
- public string? Caa019 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
- /// </summary>
- [SugarColumn(ColumnName = "CAA020")]
- public string? Caa020 { get; set; }
-
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA021")]
- public string? Caa021 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
- public decimal? Fstatus { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
-
- /// <summary>
- /// 鏈帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA022")]
- public decimal? Caa022 { get; set; }
-
- /// <summary>
- /// 鐘舵�� 瀹屽伐锛屾湭瀹屽伐
- /// </summary>
- [SugarColumn(ColumnName = "CAA023")]
- public string? Caa023 { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAA024")]
- public decimal? Caa024 { get; set; }
-
- /// <summary>
- /// 宸ヨ壓璺嚎
- /// </summary>
- [SugarColumn(ColumnName = "ROUTING_ID")]
- public string? RoutingId { get; set; }
-
- /// <summary>
- /// 浜х嚎
- /// </summary>
- [SugarColumn(ColumnName = "WORK_SHOP_ID")]
- public string? WorkShopId { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
-
- /// <summary>
- /// 璁″垝缁�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_GROUP_ID")]
- public string? WorkGroupId { get; set; }
-
- /// <summary>
- /// 璁″垝鍛�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_ID")]
- public string? PlanId { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITH")]
- public string? StockInlimith { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITL")]
- public string? StockInlimitl { get; set; }
-
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "MTONO")]
- public string? Mtono { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
- public string? Lot { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "CAA015_HEAD")]
- public string? Caa015Head { get; set; }
-
- /// <summary>
- /// 鐢熸垚鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TYPE")]
- public string? CreateType { get; set; }
-
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
- public string? SrcBillType { get; set; }
-
- /// <summary>
- /// 婧愬崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string? SrcBillNo { get; set; }
-
- /// <summary>
- /// 婧愬崟鍒嗗綍琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
- public string? SrcBillentryseq { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹彿
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_NO")]
- public string? SaleOrderNo { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
- public string? SaleOrderEntryseq { get; set; }
-
- /// <summary>
- /// 缁撴浜�
- /// </summary>
- [SugarColumn(ColumnName = "FORCE_CLOSERID")]
- public string? ForceCloserid { get; set; }
-
- /// <summary>
- /// 缁撴绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "CLOSE_TYPE")]
- public string? CloseType { get; set; }
-
- /// <summary>
- /// 婧愭媶鍒嗚鍗曠紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
- public string? SrcSplitBillno { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [SugarColumn(ColumnName = "F_ZSXG_KH")]
- public string? F_ZSXG_KH { get; set; }
-
- /// <summary>
- /// 瑕佽揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
- public string? F_ZJXF_YHRQ { get; set; }
-
- /// <summary>
- /// 鐢熶骇缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "PRD_ORG")]
- public string? PrdOrg { get; set; }
-
- /// <summary>
- /// 濮旀墭缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "TRUST_ORG")]
- public string? TrustOrg { get; set; }
-
- /// <summary>
- /// 鍚屾鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "TB_TIME")]
- public DateTime? TbTime { get; set; }
-
- /// <summary>
- /// 缁撴鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "JA_TIME")]
- public DateTime? JaTime { get; set; }
-
- /// <summary>
- /// 缁撴鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "JA_BS")]
- public string? JaBs { get; set; }
-
- /// <summary>
- /// 淇敼鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "IS_XG")]
- public decimal? IsXg { get; set; }
-
- /// <summary>
- /// 1锛屾柊澧烇紱2锛屽彉鏇�
- /// </summary>
- [SugarColumn(ColumnName = "TYPEA")]
- public string? Typea { get; set; }
-
-
- /// <summary>
- /// 鐢熶骇閫氱煡鍗� 锛堟矁灏旀柊澧烇級
- /// </summary>
- [SugarColumn(ColumnName = "WR_F_SCDD_SCTZD")]
- public string? WR_F_SCDD_SCTZD { get; set; }
-
- /// <summary>
- /// 鍨嬪彿 锛堟矁灏旀柊澧烇級
- /// </summary>
- [SugarColumn(ColumnName = "WR_F_SCDD_XH")]
- public string? WR_F_SCDD_XH { get; set; }
-
- /// <summary>
- /// 澶囨敞(琛ㄤ綋)
- /// </summary>
- [SugarColumn(ColumnName = "BTBZ")]
- public string? BTBZ { get; set; }
-
-
- /// <summary>
- /// 璁″垝纭鏃堕棿锛堟墽琛屾棩鏈燂級 --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "PLANCONFIRMATION")]
- public string? PLANCONFIRMATION { get; set; }
-
- /// <summary>
- /// ERP鐢熶骇璁㈠崟ID --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FSUBID")]
- public string? FSUBID { get; set; }
-
- /// <summary>
- /// ERP鐢熶骇璁㈠崟搴忓彿 --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FSUBBILLNOSEQ")]
- public string? FSUBBILLNOSEQ { get; set; }
-
- /// <summary>
- /// ERP鐢熶骇璁㈠崟鍗曞彿 --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FSUBBILLNO")]
- public string? FSUBBILLNO { get; set; }
-
- /// <summary>
- /// 闇�姹傛潵婧� --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FREQSRC")]
- public string? FREQSRC { get; set; }
-
- /// <summary>
- /// 婧愭媶鍒嗚鍗曡鍙� --濮斿
- /// </summary>
- [SugarColumn(ColumnName = "SRCSPLITSEQ")]
- public string? SRCSPLITSEQ { get; set; }
-
- /// <summary>
- /// ERP濮斿璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FSUBENTRYID")]
- public string? FSUBENTRYID { get; set; }
-
- /// <summary>
- /// ERP濮斿璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FPURORDERNO")]
- public string? FPURORDERNO { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
- public string? FPURORDERENTRYSEQ { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鍏ュ簱鏁伴噺 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FBASESTOCKINQTY")]
- public decimal? FBASESTOCKINQTY { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鏈叆搴撴暟閲� -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FBASENOSTOCKINQTY")]
- public decimal? FBASENOSTOCKINQTY { get; set; }
-
- /// <summary>
- /// 鍏ュ簱璐т富 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "FINSTOCKOWNERID")]
- public string? FINSTOCKOWNERID { get; set; }
-
- /// <summary>
- /// 鐢熶骇閫氱煡鍗� -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_WWDD_SCTZD")]
- public string? F_WWDD_SCTZD { get; set; }
-
- /// <summary>
- /// 鍨嬪彿 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_WWDD_XH")]
- public string? F_WWDD_XH { get; set; }
-
- /// <summary>
- /// BOM澶囨敞 -- 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_XIFG_TEXT_TZK")]
- public string? F_XIFG_TEXT_TZK { get; set; }
-}
\ No newline at end of file
+ /// 浠诲姟鍗曡〃
+ ///</summary>
+ [SugarTable("WOMCAA")]
+ public class Womcaa
+ {
+ /// <summary>
+ /// 鑷鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟琛屽唴鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="ERPID" )]
+ public decimal? Erpid { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA001" )]
+ public string Caa001 { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="CAA004" )]
+ public string Caa004 { get; set; }
+ /// <summary>
+ /// 璁″垝涓嬭揪鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CAA005" )]
+ public string Caa005 { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="CAA006" )]
+ public string Caa006 { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="CAA009" )]
+ public string Caa009 { get; set; }
+ /// <summary>
+ /// 棰勮寮�宸ユ椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA010" )]
+ public string Caa010 { get; set; }
+ /// <summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA011" )]
+ public string Caa011 { get; set; }
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAA012" )]
+ public decimal? Caa012 { get; set; }
+ /// <summary>
+ /// BOM鐗堟
+ ///</summary>
+ [SugarColumn(ColumnName="CAA013" )]
+ public string Caa013 { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA015" )]
+ public string Caa015 { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="CAA016" )]
+ public string Caa016 { get; set; }
+ /// <summary>
+ /// 宸叉帓鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAA017" )]
+ public decimal? Caa017 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟ID
+ ///</summary>
+ [SugarColumn(ColumnName="CAA018" )]
+ public decimal? Caa018 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA019" )]
+ public string Caa019 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA020" )]
+ public string Caa020 { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA021" )]
+ public string Caa021 { get; set; }
+ /// <summary>
+ /// 瀹℃牳鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="FSTATUS" )]
+ public decimal? Fstatus { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_DATE" )]
+ public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_USER" )]
+ public string CheckUser { get; set; }
+ /// <summary>
+ /// 鏈帓鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAA022" )]
+ public decimal? Caa022 { get; set; }
+ /// <summary>
+ /// 涓氬姟鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="CAA023" )]
+ public string Caa023 { get; set; }
+ /// <summary>
+ /// 宸插叆搴撴暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA024" )]
+ public decimal? Caa024 { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎
+ ///</summary>
+ [SugarColumn(ColumnName="ROUTING_ID" )]
+ public string RoutingId { get; set; }
+ /// <summary>
+ /// 浜х嚎
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_SHOP_ID" )]
+ public string WorkShopId { get; set; }
+ /// <summary>
+ /// 浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string DepotCode { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public string CreateDate { get; set; }
+ /// <summary>
+ /// 璁″垝缁�
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_GROUP_ID" )]
+ public string WorkGroupId { get; set; }
+ /// <summary>
+ /// 璁″垝鍛�
+ ///</summary>
+ [SugarColumn(ColumnName="PLAN_ID" )]
+ public string PlanId { get; set; }
+ /// <summary>
+ /// 鍏ュ簱涓婇檺
+ ///</summary>
+ [SugarColumn(ColumnName="STOCK_INLIMITH" )]
+ public string StockInlimith { get; set; }
+ /// <summary>
+ /// 鍏ュ簱涓嬮檺
+ ///</summary>
+ [SugarColumn(ColumnName="STOCK_INLIMITL" )]
+ public string StockInlimitl { get; set; }
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="MTONO" )]
+ public string Mtono { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName="LOT" )]
+ public string Lot { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA015_HEAD" )]
+ public string Caa015Head { get; set; }
+ /// <summary>
+ /// 鐢熸垚鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_TYPE" )]
+ public string CreateType { get; set; }
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILL_TYPE" )]
+ public string SrcBillType { get; set; }
+ /// <summary>
+ /// 婧愬崟缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILL_NO" )]
+ public string SrcBillNo { get; set; }
+ /// <summary>
+ /// 婧愬崟鍒嗗綍琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILLENTRYSEQ" )]
+ public string SrcBillentryseq { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹彿
+ ///</summary>
+ [SugarColumn(ColumnName="SALE_ORDER_NO" )]
+ public string SaleOrderNo { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="SALE_ORDER_ENTRYSEQ" )]
+ public string SaleOrderEntryseq { get; set; }
+ /// <summary>
+ /// 缁撴浜�
+ ///</summary>
+ [SugarColumn(ColumnName="FORCE_CLOSERID" )]
+ public string ForceCloserid { get; set; }
+ /// <summary>
+ /// 缁撴绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="CLOSE_TYPE" )]
+ public string CloseType { get; set; }
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曠紪鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_SPLIT_BILLNO" )]
+ public string SrcSplitBillno { get; set; }
+ /// <summary>
+ /// 鐢熶骇缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName="PRD_ORG" )]
+ public string PrdOrg { get; set; }
+ /// <summary>
+ /// 濮旀墭缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName="TRUST_ORG" )]
+ public string TrustOrg { get; set; }
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="TB_TIME" )]
+ public DateTime? TbTime { get; set; }
+ /// <summary>
+ /// 缁撴鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="JA_TIME" )]
+ public DateTime? JaTime { get; set; }
+ /// <summary>
+ /// 缁撴鏍囪瘑
+ ///</summary>
+ [SugarColumn(ColumnName="JA_BS" )]
+ public decimal? JaBs { get; set; }
+ /// <summary>
+ /// 鏃х墿鏂欑紪鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_BASEPROPERTY" )]
+ public string FWwcBaseproperty { get; set; }
+ /// <summary>
+ /// 璁″垝瀹屽伐鎼哄甫鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_DATETIME" )]
+ public DateTime? FWwcDatetime { get; set; }
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_SCRKRQ" )]
+ public DateTime? FWwcScrkrq { get; set; }
+ /// <summary>
+ /// 宸ユ椂
+ ///</summary>
+ [SugarColumn(ColumnName="FGS" )]
+ public decimal? Fgs { get; set; }
+ /// <summary>
+ /// 浜х嚎浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_DECIMAL" )]
+ public decimal? FWwcDecimal { get; set; }
+ /// <summary>
+ /// 绾垮埆
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_XB" )]
+ public string FWwcXb { get; set; }
+ /// <summary>
+ /// 閿�鍞憳
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_BASE" )]
+ public string FWwcBase { get; set; }
+ /// <summary>
+ /// 淇敼鏍囪瘑
+ ///</summary>
+ [SugarColumn(ColumnName="IS_XG" )]
+ public decimal? IsXg { get; set; }
+ /// <summary>
+ /// 濮斿閲囪喘璁㈠崟
+ ///</summary>
+ [SugarColumn(ColumnName="FPURORDERNO" )]
+ public string Fpurorderno { get; set; }
+ /// <summary>
+ /// 濮斿閲囪喘璁㈠崟琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName="FPURORDERENTRYSEQ" )]
+ public string Fpurorderentryseq { get; set; }
+ /// <summary>
+ /// 濮斿璁㈠崟鍒嗗綍鍐呯爜
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBENTRYID" )]
+ public decimal? Fsubentryid { get; set; }
+ /// <summary>
+ /// 濮斿鍏ュ簱鏁�
+ ///</summary>
+ [SugarColumn(ColumnName="FSTOCKINQTY" )]
+ public decimal? Fstockinqty { get; set; }
+ /// <summary>
+ /// 濮斿鏈叆搴撴暟
+ ///</summary>
+ [SugarColumn(ColumnName="FNOSTOCKINQTY" )]
+ public decimal? Fnostockinqty { get; set; }
+ /// <summary>
+ /// BOM澶囨敞 -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="F_XIFG_TEXT_TZK" )]
+ public string FXifgTextTzk { get; set; }
+ /// <summary>
+ /// 鐢熶骇閫氱煡鍗� 锛堟矁灏旀柊澧烇級
+ ///</summary>
+ [SugarColumn(ColumnName="WR_F_SCDD_SCTZD" )]
+ public string WrFScddSctzd { get; set; }
+ /// <summary>
+ /// 鍨嬪彿 锛堟矁灏旀柊澧烇級
+ ///</summary>
+ [SugarColumn(ColumnName="WR_F_SCDD_XH" )]
+ public string WrFScddXh { get; set; }
+ /// <summary>
+ /// 璁″垝纭鏃堕棿锛堟墽琛屾棩鏈燂級 --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="PLANCONFIRMATION" )]
+ public string Planconfirmation { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟ID --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBID" )]
+ public string Fsubid { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿 --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBBILLNOSEQ" )]
+ public string Fsubbillnoseq { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿 --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FSUBBILLNO" )]
+ public string Fsubbillno { get; set; }
+ /// <summary>
+ /// 闇�姹傛潵婧� --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FREQSRC" )]
+ public string Freqsrc { get; set; }
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曡鍙� --濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="SRCSPLITSEQ" )]
+ public string Srcsplitseq { get; set; }
+ /// <summary>
+ /// 鍩烘湰鍗曚綅鍏ュ簱鏁伴噺 -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FBASESTOCKINQTY" )]
+ public string Fbasestockinqty { get; set; }
+ /// <summary>
+ /// 鍩烘湰鍗曚綅鏈叆搴撴暟閲� -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FBASENOSTOCKINQTY" )]
+ public string Fbasenostockinqty { get; set; }
+ /// <summary>
+ /// 鍏ュ簱璐т富 -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="FINSTOCKOWNERID" )]
+ public string Finstockownerid { get; set; }
+ /// <summary>
+ /// 鐢熶骇閫氱煡鍗� -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWDD_SCTZD" )]
+ public string FWwddSctzd { get; set; }
+ /// <summary>
+ /// 鍨嬪彿 -- 濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWDD_XH" )]
+ public string FWwddXh { get; set; }
+ /// <summary>
+ /// 琛ㄤ綋澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="BTBZ" )]
+ public string Btbz { get; set; }
+ /// <summary>
+ /// 鏃ヤ骇鑳�
+ ///</summary>
+ [SugarColumn(ColumnName="RCN" )]
+ public string Rcn { get; set; }
+ /// <summary>
+ /// 鍏ュ簱缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName="RK_ORG" )]
+ public string RkOrg { get; set; }
+ /// <summary>
+ /// 鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="TYPEA" )]
+ public string Typea { get; set; }
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="F_ZJXF_YHRQ" )]
+ public string FZjxfYhrq { get; set; }
+ /// <summary>
+ /// 瀹㈡埛
+ ///</summary>
+ [SugarColumn(ColumnName="F_ZSXG_KH" )]
+ public string FZsxgKh { get; set; }
+ }
+}
diff --git a/StandardInterface/MES.Service/Modes/Womcab.cs b/StandardInterface/MES.Service/Modes/Womcab.cs
index 50ccc1f..cc046e3 100644
--- a/StandardInterface/MES.Service/Modes/Womcab.cs
+++ b/StandardInterface/MES.Service/Modes/Womcab.cs
@@ -1,292 +1,313 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟瀛愯〃
-/// </summary>
-[SugarTable("WOMCAB")]
-public class Womcab
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
{
/// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
- OracleSequenceName = "SEQ_CAB")]
- public decimal? Id { get; set; }
+ /// 浠诲姟鍗曠墿鏂欒〃
+ ///</summary>
+ [SugarTable("WOMCAB")]
+ public class Womcab
+ {
+ /// <summary>
+ /// 鑷鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 鐢熶骇鐢ㄦ枡娓呭崟琛屽唴鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="ERPID" )]
+ public decimal? Erpid { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAB001" )]
+ public string Cab001 { get; set; }
+ /// <summary>
+ /// 搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAB002" )]
+ public string Cab002 { get; set; }
+ /// <summary>
+ /// 鏉愭枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="CAB003" )]
+ public string Cab003 { get; set; }
+ /// <summary>
+ /// 闇�棰嗙敤閲�
+ ///</summary>
+ [SugarColumn(ColumnName="CAB006" )]
+ public decimal? Cab006 { get; set; }
+ /// <summary>
+ /// 宸查鐢ㄩ噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAB007" )]
+ public decimal? Cab007 { get; set; }
+ /// <summary>
+ /// 宸ヨ壓
+ ///</summary>
+ [SugarColumn(ColumnName="CAB008" )]
+ public string Cab008 { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="CAB009" )]
+ public string Cab009 { get; set; }
+ /// <summary>
+ /// 缁勬垚鐢ㄩ噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAB012" )]
+ public decimal? Cab012 { get; set; }
+ /// <summary>
+ /// 鏄惁鏇挎枡
+ ///</summary>
+ [SugarColumn(ColumnName="CAB014" )]
+ public decimal? Cab014 { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟琛屽唴鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="PID" )]
+ public decimal? Pid { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟琛屽唴鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="EID" )]
+ public decimal? Eid { get; set; }
+ /// <summary>
+ /// 浣嶇疆鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="POSITION_NO" )]
+ public string PositionNo { get; set; }
+ /// <summary>
+ /// 鍙戞枡缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName="ISSUING_ORGANIZATION" )]
+ public string IssuingOrganization { get; set; }
+ /// <summary>
+ /// 渚涘簲缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName="SUPPLY_ORGANIZATION" )]
+ public string SupplyOrganization { get; set; }
+ /// <summary>
+ /// 璐т富
+ ///</summary>
+ [SugarColumn(ColumnName="OWNER_ID" )]
+ public string OwnerId { get; set; }
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="MTONO" )]
+ public string Mtono { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName="LOT" )]
+ public string Lot { get; set; }
+ /// <summary>
+ /// 浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string DepotCode { get; set; }
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName="ISSUE_TYPE" )]
+ public string IssueType { get; set; }
+ /// <summary>
+ /// 渚涘簲绫诲瀷 C閲囪喘 Z鑷埗 W濮斿
+ ///</summary>
+ [SugarColumn(ColumnName="SUPPLY_TYPE" )]
+ public string SupplyType { get; set; }
+ /// <summary>
+ /// 鍒嗗瓙
+ ///</summary>
+ [SugarColumn(ColumnName="NUMERATOR" )]
+ public decimal? Numerator { get; set; }
+ /// <summary>
+ /// 鍒嗘瘝
+ ///</summary>
+ [SugarColumn(ColumnName="DENOMINATOR" )]
+ public decimal? Denominator { get; set; }
+ /// <summary>
+ /// 鍥哄畾鎹熻��
+ ///</summary>
+ [SugarColumn(ColumnName="SCRAPQTY" )]
+ public decimal? Scrapqty { get; set; }
+ /// <summary>
+ /// 鍙樺姩鎹熻�楃巼
+ ///</summary>
+ [SugarColumn(ColumnName="SCRAPRATE" )]
+ public decimal? Scraprate { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="SALES_ORDER" )]
+ public string SalesOrder { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹�
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_TEXT1" )]
+ public string FWwcText1 { get; set; }
+ /// <summary>
+ /// 璁″垝瀹屽伐鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_DATE" )]
+ public DateTime? FWwcDate { get; set; }
+ /// <summary>
+ /// 鏃х墿鏂欑紪鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="F_WWC_BASEPROPERTY" )]
+ public string FWwcBaseproperty { get; set; }
+ /// <summary>
+ /// 浣跨敤姣斾緥
+ ///</summary>
+ [SugarColumn(ColumnName="FUSERATE" )]
+ public decimal? Fuserate { get; set; }
+ /// <summary>
+ /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ ///</summary>
+ [SugarColumn(ColumnName="FMATERIALTYPE" )]
+ public decimal? Fmaterialtype { get; set; }
+ /// <summary>
+ /// 瀛愰」鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="FUNITID3" )]
+ public string Funitid3 { get; set; }
+ /// <summary>
+ /// 瀛愰」鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="FUNITID2" )]
+ public string Funitid2 { get; set; }
+ /// <summary>
+ /// 鐢熶骇閫氱煡鍗�
+ ///</summary>
+ [SugarColumn(ColumnName="F_XIFG_BASE_RE5" )]
+ public string FXifgBaseRe5 { get; set; }
+ /// <summary>
+ /// 璐т富绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="FOWNERTYPEID" )]
+ public string Fownertypeid { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="ERP_PRODUCTION_ENTRY_CODE" )]
+ public string ErpProductionEntryCode { get; set; }
+ /// <summary>
+ /// 鐢ㄦ枡娓呭崟澶囨敞 -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FMEMO" )]
+ public string Fmemo { get; set; }
+ /// <summary>
+ /// 棰勭暀绫诲瀷 -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FRESERVETYPE" )]
+ public string Freservetype { get; set; }
+ /// <summary>
+ /// 闇�姹傛棩鏈� -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FNEEDDATE" )]
+ public DateTime? Fneeddate { get; set; }
+ /// <summary>
+ /// 搴撳瓨鐘舵�� -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FSTOCKSTATUSID" )]
+ public string Fstockstatusid { get; set; }
+ /// <summary>
+ /// 鎷ㄥ嚭浠撳簱 -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FSRCTRANSSTOCKID" )]
+ public string Fsrctransstockid { get; set; }
+ /// <summary>
+ /// 鎷ㄥ嚭缁勭粐 -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FSRCTRANSORGID" )]
+ public string Fsrctransorgid { get; set; }
+ /// <summary>
+ /// 鏄惁鍏抽敭浠� -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FISKEYCOMPONENT" )]
+ public string Fiskeycomponent { get; set; }
+ /// <summary>
+ /// 鏄惁鍙戞崯鑰� -- 濮斿鏂板
+ ///</summary>
+ [SugarColumn(ColumnName="FISGETSCRAP" )]
+ public string Fisgetscrap { get; set; }
+ /// <summary>
+ /// 鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="WR_F_XIFG_BASE_83G" )]
+ public string WrFXifgBase83g { get; set; }
+ /// <summary>
+ /// 鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="WR_F_XIFG_BASE_QTR" )]
+ public string WrFXifgBaseQtr { get; set; }
+ /// <summary>
+ /// 鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName="TYPEB" )]
+ public string Typeb { get; set; }
+ /// <summary>
+ /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ ///</summary>
+ [SugarColumn(ColumnName="MATERIAL_TYPE" )]
+ public string MaterialType { get; set; }
+ /// <summary>
+ /// 浣跨敤姣斾緥锛�%锛�
+ ///</summary>
+ [SugarColumn(ColumnName="USE_RATE" )]
+ public decimal? UseRate { get; set; }
+ /// <summary>
+ /// 椤规鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="FREPLACEGROUP" )]
+ public decimal? Freplacegroup { get; set; }
+ /// <summary>
+ /// 搴斿彂鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="MUST_QTY" )]
+ public decimal? MustQty { get; set; }
+ /// <summary>
+ /// 鏈鏁�
+ ///</summary>
+ [SugarColumn(ColumnName="WLSL" )]
+ public string Wlsl { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
- public decimal? Erpid { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡浠ｇ爜
+ ///</summary>
+ [SugarColumn(ColumnName = "KHWLBM")]
+ public string Khwlbm { get; set; }
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAB001")]
- public string? Cab001 { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "KHWLMC")]
+ public string Khwlmc { get; set; }
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "CAB002")]
- public string? Cab002 { get; set; }
+ /// <summary>
+ /// 闇�姹傜粍缁�
+ ///</summary>
+ [SugarColumn(ColumnName = "XQZZ")]
+ public string Xqzz { get; set; }
- /// <summary>
- /// 鏉愭枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CAB003")]
- public string? Cab003 { get; set; }
-
- /// <summary>
- /// 闇�棰嗙敤閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAB006")]
- public decimal? Cab006 { get; set; }
-
- /// <summary>
- /// 宸查鐢ㄩ噺
- /// </summary>
- [SugarColumn(ColumnName = "CAB007")]
- public decimal? Cab007 { get; set; }
-
- /// <summary>
- /// 宸ヨ壓
- /// </summary>
- [SugarColumn(ColumnName = "CAB008")]
- public string? Cab008 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAB009")]
- public string? Cab009 { get; set; }
-
- /// <summary>
- /// 缁勬垚鐢ㄩ噺
- /// </summary>
- [SugarColumn(ColumnName = "CAB012")]
- public decimal? Cab012 { get; set; }
-
- /// <summary>
- /// 鏄惁鏇挎枡
- /// </summary>
- [SugarColumn(ColumnName = "CAB014")]
- public string? Cab014 { get; set; }
-
- /// <summary>
- /// PID
- /// </summary>
- [SugarColumn(ColumnName = "PID")]
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "EID")]
- public decimal? Eid { get; set; }
-
- /// <summary>
- /// 浣嶇疆鍙�
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_NO")]
- public string? PositionNo { get; set; }
-
- /// <summary>
- /// 鍙戞枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
- public string? IssuingOrganization { get; set; }
-
- /// <summary>
- /// 渚涘簲缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
- public string? SupplyOrganization { get; set; }
-
- /// <summary>
- /// 璐т富
- /// </summary>
- [SugarColumn(ColumnName = "OWNER_ID")]
- public string? OwnerId { get; set; }
-
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "MTONO")]
- public string? Mtono { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
- public string? Lot { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "ISSUE_TYPE")]
- public string? IssueType { get; set; }
-
- /// <summary>
- /// 渚涘簲绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLY_TYPE")]
- public string? SupplyType { get; set; }
-
- /// <summary>
- /// 鍒嗗瓙
- /// </summary>
- [SugarColumn(ColumnName = "NUMERATOR")]
- public decimal? Numerator { get; set; }
-
- /// <summary>
- /// 鍒嗘瘝
- /// </summary>
- [SugarColumn(ColumnName = "DENOMINATOR")]
- public decimal? Denominator { get; set; }
-
- /// <summary>
- /// 鍥哄畾鎹熻��
- /// </summary>
- [SugarColumn(ColumnName = "SCRAPQTY")]
- public decimal? SCRAPQTY { get; set; }
-
- /// <summary>
- /// 鍙樺姩鎹熻�楃巼
- /// </summary>
- [SugarColumn(ColumnName = "SCRAPRATE")]
- public decimal? SCRAPRATE { get; set; }
-
-
- /// <summary>
- /// 搴斿彂鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "Must_Qty")]
- public decimal? MustQty { get; set; }
-
- /// <summary>
- /// 椤规鍙�
- /// </summary>
- [SugarColumn(ColumnName = "FREPLACEGROUP")]
- public int? Freplacegroup { get; set; }
-
- /// <summary>
- /// 浣跨敤姣斾緥锛�%锛�
- /// </summary>
- [SugarColumn(ColumnName = "USE_RATE")]
- public decimal? UseRate { get; set; }
-
- /// <summary>
- /// 瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_TYPE")]
- public string? MaterialType { get; set; }
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "TYPEB")]
- public string? Typeb { get; set; }
-
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "WR_F_XIFG_BASE_QTR")]
- public string? WR_F_XIFG_Base_qtr { get; set; }
-
- /// <summary>
- /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
- /// </summary>
- [SugarColumn(ColumnName = "WR_F_XIFG_BASE_83G")]
- public string? WR_F_XIFG_Base_83g { get; set; }
-
-
- /////----濮斿鏂板
-
- /// <summary>
- /// 鏄惁鍙戞崯鑰� -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FISGETSCRAP")]
- public string? Fisgetscrap { get; set; }
-
- /// <summary>
- /// 鏄惁鍏抽敭浠� -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FISKEYCOMPONENT")]
- public string? Fiskeycomponent { get; set; }
-
- /// <summary>
- /// 鎷ㄥ嚭缁勭粐 -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FSRCTRANSORGID")]
- public string? Fsrctransorgid { get; set; }
-
- /// <summary>
- /// 鎷ㄥ嚭浠撳簱 -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FSRCTRANSSTOCKID")]
- public string? Fsrctransstockid { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐘舵�� -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FSTOCKSTATUSID")]
- public string? Fstockstatusid { get; set; }
-
- /// <summary>
- /// 闇�姹傛棩鏈� -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FNEEDDATE")]
- public DateTime? Fneeddate { get; set; }
-
- /// <summary>
- /// 棰勭暀绫诲瀷 -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FRESERVETYPE")]
- public string? Freservetype { get; set; }
-
- /// <summary>
- /// 鐢ㄦ枡娓呭崟澶囨敞 -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "FMEMO")]
- public string? Fmemo { get; set; }
-
- /// <summary>
- /// ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿鏂板
- /// </summary>
- [SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")]
- public string? ErpProductionEntryCode { get; set; }
-
- /// <summary>
- /// 璐т富绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FOWNERTYPEID")]
- public string? FOWNERTYPEID { get; set; }
-
- /// <summary>
- /// 鐢熶骇閫氱煡鍗�
- /// </summary>
- [SugarColumn(ColumnName = "F_XIFG_BASE_RE5")]
- public string? F_XIFG_BASE_RE5 { get; set; }
-
- /// <summary>
- /// 瀛愰」鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FUNITID2")]
- public string? FUNITID2 { get; set; }
-
- /// <summary>
- /// 瀛愰」鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FUNITID3")]
- public string? FUNITID3 { get; set; }
-}
\ No newline at end of file
+ /// <summary>
+ /// 闇�姹傞儴闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "XQBM")]
+ public string Xqbm { get; set; }
+ /// <summary>
+ /// 鏀舵枡缁勭粐
+ ///</summary>
+ [SugarColumn(ColumnName = "SLZZ")]
+ public string Slzz { get; set; }
+ /// <summary>
+ /// 鏀舵枡閮ㄩ棬
+ ///</summary>
+ [SugarColumn(ColumnName = "SLBM")]
+ public string Slbm { get; set; }
+ }
+}
diff --git a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
index e2943de..ae89557 100644
--- a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -129,7 +129,7 @@
Caa011 = erpDto.FPlanFinishDate,
//ParseDateTime(erpDto.FPlanFinishDate) ?? null,
- PLANCONFIRMATION = erpDto.PlanConfirmation,
+ Planconfirmation = erpDto.PlanConfirmation,
StockInlimith =
erpDto
.FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH),
@@ -141,36 +141,36 @@
Caa013 = erpDto.FBomId,
//SalesOrderNo = erpDto.F_UNW_XSDDH,
CreateType = erpDto.FCreateType,
- FSUBID = erpDto.FSUBID,
- FSUBBILLNOSEQ = erpDto.FSUBBILLNOSEQ,
- FSUBBILLNO = erpDto.FSUBBILLNO,
+ Fsubid = erpDto.FSUBID,
+ Fsubbillnoseq = erpDto.FSUBBILLNOSEQ,
+ Fsubbillno = erpDto.FSUBBILLNO,
SrcBillType = erpDto.FSrcBillType,
SrcBillNo = erpDto.FSrcBillNo,
SrcBillentryseq = erpDto.FSrcBillEntrySeq,
- FREQSRC = erpDto.FReqSrc,
+ Freqsrc = erpDto.FReqSrc,
SaleOrderNo = erpDto.FSALEORDERNO,
SaleOrderEntryseq = erpDto.FSaleOrderEntrySeq,
ForceCloserid = erpDto.FFORCECLOSERID,
CloseType = erpDto.FCloseType,
SrcSplitBillno = erpDto.FDescription,
- SRCSPLITSEQ = erpDto.SrcSplitSeq,
+ Srcsplitseq = erpDto.SrcSplitSeq,
Erpid = Convert.ToDecimal(erpDto.FID),
- FSUBENTRYID = erpDto.FSUBENTRYID,
- FPURORDERNO = erpDto.FPurOrderNo,
- FPURORDERENTRYSEQ =
+ Fsubentryid = Convert.ToDecimal(erpDto.FSUBENTRYID),
+ Fpurorderno = erpDto.FPurOrderNo,
+ Fpurorderentryseq =
erpDto
.FPurOrderEntrySeq, //Convert.ToInt32(erpDto.FPurOrderEntrySeq),
- FBASESTOCKINQTY = Convert.ToDecimal(erpDto.FBaseStockInQty),
- FBASENOSTOCKINQTY = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
- FINSTOCKOWNERID = erpDto.FInStockOwnerId,
+ Fbasestockinqty = erpDto.FBaseStockInQty,
+ Fbasenostockinqty = erpDto.FBaseNoStockInQty,
+ Finstockownerid = erpDto.FInStockOwnerId,
//PlanConfirmation = erpDto.PlanConfirmation != null
// ? DateTime.ParseExact(erpDto.PlanConfirmation,
// "yyyy-MM-dd HH:mm:ss", null)
// : null,
Typea = erpDto.TypeA,
- F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
- F_WWDD_XH = erpDto.F_WWDD_XH,
- F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
+ // F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD,
+ // F_WWDD_XH = erpDto.F_WWDD_XH,
+ //F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -209,8 +209,8 @@
Denominator = Convert.ToDecimal(erpDto.FDenominator),
Erpid = Convert.ToDecimal(erpDto.FPPOMENTRYID),
Eid = Convert.ToDecimal(erpDto.FPPOMID),
- SCRAPQTY = Convert.ToDecimal(erpDto.FFixScrapQty),
- SCRAPRATE = Convert.ToDecimal(erpDto.FScrapRate),
+ Scrapqty = Convert.ToDecimal(erpDto.FFixScrapQty),
+ Scraprate = Convert.ToDecimal(erpDto.FScrapRate),
MaterialType = erpDto.FMaterialType,
//Unit2 = erpDto.FUnitID3,
Freplacegroup = Convert.ToInt32(erpDto.FReplaceGroup),
@@ -230,10 +230,10 @@
Fmemo = erpDto.FMEMO,
Typeb = erpDto.TypeB,
ErpProductionEntryCode = erpDto.FSUBENTRYID,
- FOWNERTYPEID = erpDto.FOwnerTypeId,
- F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5,
- FUNITID2 = erpDto.FUnitID2,
- FUNITID3 = erpDto.FUnitID3
+ // FOWNERTYPEID = erpDto.FOwnerTypeId,
+ // F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5,
+ // FUNITID2 = erpDto.FUnitID2,
+ //FUNITID3 = erpDto.FUnitID3
};
var single =
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 7769901..baacc02 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -154,7 +154,7 @@
var entity = new Womcaa
{
Erpid = Convert.ToInt32(dto.Id), /// ERPID
- Caa001 = dto.ppbombillno, /// 鍗曞彿
+ Caa001 = dto.FBillNo, /// 鍗曞彿
Caa021 = dto.FWorkShopID, /// 宸ヤ綔杞﹂棿
RoutingId = dto.FRoutingId, /// 宸ヨ壓璺嚎
WorkShopId = dto.FREMWorkShopId, /// 浜х嚎
@@ -177,7 +177,8 @@
Mtono = dto.FMTONO, /// 璁″垝璺熻釜鍙�
Lot = dto.FLot, /// 鎵瑰彿
Caa013 = dto.FBomId, /// BOM鐗堟
-
+ Caa015 = dto.CAA015, //閿�鍞鍗曞彿
+ Caa015Head = dto.CAA015_line, //閿�鍞鍗曡鍙�
CreateType = dto.FCreateType, /// 鐢熸垚鏂瑰紡
Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
? Convert.ToInt32(dto.PLAN_ID)
@@ -193,14 +194,16 @@
CloseType = dto.FCloseType, /// 缁撴绫诲瀷
SrcSplitBillno = dto.FSrcSplitBillNo, /// 婧愭媶鍒嗚鍗曠紪鍙�
Caa016 = dto.FDescription, /// 澶囨敞
- BTBZ = dto.BTBZ, /// 澶囨敞
+ Btbz = dto.BTBZ, /// 澶囨敞
PrdOrg = dto.FPrdOrgId, /// 鐢熶骇缁勭粐ID
TrustOrg = dto.FEnTrustOrgId, /// 濮旀墭缁勭粐ID
Typea = dto.TypeA, /// 鍗曟嵁鐘舵��
+ RkOrg = dto.RK_ORG, //鍏ュ簱缁勭粐
+ Rcn=dto.RCN, //鏃ヤ骇鑳�
//娌冨皵鏂板
- WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
+ // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD
//WR_F_SCDD_XH = dto.F_SCDD_XH
};
@@ -220,35 +223,42 @@
var womcab = new Womcab
{
Erpid = Convert.ToDecimal(dto.ID),
- Cab001 = dto.FBillNo,
- Cab002 = dto.FSeq,
- Cab003 = dto.FMaterialID,
- Cab006 = Convert.ToDecimal(dto.FNeedQty),
- MustQty = Convert.ToDecimal(dto.FMustQty),
- Cab007 = Convert.ToDecimal(dto.FPickedQty),
- PositionNo = dto.FPositionNO,
- SupplyOrganization = dto.FChildSupplyOrgId,
- IssuingOrganization = dto.FSupplyOrg,
- OwnerId = dto.FOwnerID,
- Mtono = dto.FMTONO,
- Lot = dto.FLot,
- DepotCode = dto.FStockID,
- IssueType = dto.FIssueType,
- Cab009 = dto.FUnitID,
- SupplyType = dto.FSupplyType,
- Cab012 = Convert.ToDecimal(dto.FStdQty),
- Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
- UseRate = Convert.ToDecimal(dto.FUseRate),
- MaterialType = dto.FMaterialType,
- Cab014 = dto.FIsKeyItem,
- Numerator = Convert.ToDecimal(dto.FNumerator),
- Denominator = Convert.ToDecimal(dto.FDenominator),
+ Cab001 = dto.FBillNo, //鍗曟嵁缂栧彿
+ Cab002 = dto.FSeq, //搴忓彿
+ Cab003 = dto.FMaterialID, //瀛愰」鐗╂枡缂栫爜
+ Cab006 = Convert.ToDecimal(dto.FNeedQty), //闇�姹傛暟閲�
+ MustQty = Convert.ToDecimal(dto.FMustQty), //搴斿彂鏁伴噺
+ Cab007 = Convert.ToDecimal(dto.FPickedQty), //宸查鏁伴噺
+ PositionNo = dto.FPositionNO, //浣嶇疆鍙�
+ SupplyOrganization = dto.FChildSupplyOrgId, //渚涘簲缁勭粐
+ IssuingOrganization = dto.FSupplyOrg, //鍙戞枡缁勭粐
+ OwnerId = dto.FOwnerID, //璐т富
+ Mtono = dto.FMTONO, //璁″垝璺熻釜鍙�
+ Lot = dto.FLot, //鎵瑰彿
+ DepotCode = dto.FStockID, //浠撳簱
+ IssueType = dto.FIssueType, //鍙戞枡鏂瑰紡
+ Cab009 = dto.FUnitID, //鍗曚綅
+ SupplyType = dto.FSupplyType, //渚涘簲绫诲瀷
+ Cab012 = Convert.ToDecimal(dto.FStdQty), // 鏍囧噯鐢ㄩ噺
+ // Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
+ UseRate = Convert.ToDecimal(dto.FUseRate), //浣跨敤姣斾緥
+ MaterialType = dto.FMaterialType, //瀛愰」绫诲瀷
+ Cab014 = Convert.ToInt32(dto.FIsKeyItem), //鏇夸唬涓绘枡
+ Numerator = Convert.ToDecimal(dto.FNumerator), //鍒嗗瓙
+ Denominator = Convert.ToDecimal(dto.FDenominator), //鍒嗘瘝
Pid = Convert.ToDecimal(dto.PID),
Eid = Convert.ToDecimal(dto.PID),
- SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- Typeb = dto.TypeB,
- WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
+ Scrapqty = Convert.ToDecimal(dto.FFixScrapQty), //鍥哄畾鎹熻��
+ Scraprate = Convert.ToDecimal(dto.FScrapRate), //鍙樺姩鎹熻�楃巼
+ Wlsl=dto.WLSL,
+ Khwlbm=dto.KWWLBM,
+ Khwlmc =dto.KHWLMC,
+ Slzz=dto.SLZZ,
+ Slbm=dto.SLBM,
+ Xqbm=dto.XQBM,
+ Xqzz=dto.XQZZ,
+ // Typeb = dto.TypeB,
+ // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr
//WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g
};
diff --git a/StandardInterface/MES.Service/service/WomcaaWWManager.cs b/StandardInterface/MES.Service/service/WomcaaWWManager.cs
index a92be2b..f0cdce2 100644
--- a/StandardInterface/MES.Service/service/WomcaaWWManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaWWManager.cs
@@ -122,7 +122,7 @@
//PrdOrg = dto.erP_SCZZ,
//TrustOrg = dto.erP_WTZZ,
TbTime = DateTime.Now,
- JaBs = "0"
+ JaBs = 0
};
if (dto.Type == "5")
entity.IsXg = 1;
@@ -131,7 +131,7 @@
if (dto.FStatus == "6" || dto.FStatus == "7")
{
- entity.JaBs = "1";
+ entity.JaBs =1;
entity.JaTime = DateTime.Now;
}
@@ -156,7 +156,7 @@
Cab006 = Convert.ToDecimal(dto.FNeedQty),
Cab007 = Convert.ToDecimal(dto.FPickedQty),
Cab009 = dto.FUnitID,
- Cab014 = dto.FIsKeyItem,
+ Cab014 = Convert.ToInt32(dto.FIsKeyItem),
Pid = Convert.ToDecimal(dto.PID),
Eid = Convert.ToDecimal(dto.PID),
PositionNo = dto.FPositionNO,
@@ -170,8 +170,8 @@
SupplyType = dto.FSupplyType,
Numerator = Convert.ToDecimal(dto.FNumerator),
Denominator = Convert.ToDecimal(dto.FDenominator),
- SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
- SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
+ Scrapqty = Convert.ToDecimal(dto.FFixScrapQty),
+ Scraprate = Convert.ToDecimal(dto.FScrapRate)
//SalesOrder = dto.FXSHTBH,
};
--
Gitblit v1.9.3