造梦者生产订单变更

wbc

2 天以前 646009b561f1469f12b6c389e636fe6a86332918

造梦者生产订单变更

 StandardPda/MES.Service/Dto/webApi/ErpCAA.cs

@@ -6,8 +6,8 @@
    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? FRoutingId { get; set; }
    //public string? FREMWorkShopId { get; set; }
    public string? FStockId { get; set; }
    public string? FDate { get; set; }
    public string? FBillType { get; set; }
@@ -26,8 +26,6 @@
    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; }
@@ -41,31 +39,35 @@
    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? BTBZ { get; set; }

    //public string? fsubentryid { get; set; }
    //public string? FPurOrderNo { get; set; }
    //public string? FPurOrderEntrySeq { get; set; }
    //public string? Caa024 { get; set; }
    //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? FBOMType { get; set; }
    public decimal? FBOMMaster { get; set; }
    public string? FBOMAlternate { get; set; }
    public string? FBOMEffeDate { get; set; }
    public string? FRoutingAlternate { get; set; }
    public string? FRoutingEffeDate { get; set; }
    public decimal? FMRPQty { get; set; }
    public DateTime? FActualStartDate { get; set; }
    public DateTime? FActualCompleteDate { get; set; }
    public string? FMOSourceDocType { get; set; }
    public decimal? FProject { get; set; }
    public decimal? FOwnerOrg { get; set; }
    public string? FCreatedBy { get; set; }
    public DateTime? FCreatedOn { get; set; }
    public decimal? FTotalStartQty { get; set; }
    public decimal? FTotalCompleteQty { get; set; }
    public decimal? FTotalRcvQty { get; set; }
    public decimal? FTotalReworkingQty { get; set; }
    public string? FReasonForRework { get; set; }
    public decimal? FIsForceWholeSet { get; set; }
    public string? TypeA { get; set; }

    //委外字段
    public string? F_ZJXF_DATETIME_YHRQ { get; set; }
    public string? F_ZJXF_BASE_KH { get; set; }


    //沃尔新增 生产通知单 、 型号
    public string? F_SCDD_SCTZD { get; set; }
    public string? F_SCDD_XH { get; set; }
    
}

 StandardPda/MES.Service/Dto/webApi/ErpCAB.cs

@@ -17,8 +17,6 @@
    public string? FStockID { 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; }
@@ -33,13 +31,22 @@

    public string? FFixScrapQty { get; set; }
    public string? FScrapRate { get; set; }
    public decimal? FBOMReqQty { get; set; }
    public decimal? FIsOverIssue { get; set; }
    public decimal? FStandardMaterialScale { get; set; }
    public decimal? FFixedMaterialNum { get; set; }
    public decimal? FIsSubstitute { get; set; }
    public decimal? FSubstitutedItem { get; set; }
    public decimal? FIssueUOM { get; set; }
    public string? FProject { get; set; }
    public decimal? FQPA { get; set; }
    public string? FScrapType { get; set; }
    public string? FBFOpportunity { get; set; }
    public string? FSupplyWh { get; set; }
    public decimal? FMOCompleteSetCheck { get; set; }
    public decimal? FMOStartSetCheck { get; set; }
    public decimal? FIsCoupleIssue { get; set; }
    public string? FDescription { get; set; }
    public string? TypeB { get; set; }
    public string? F_XIFG_Base_qtr { get; set; }
    public string? F_XIFG_Base_83g { get; set; }

    //public string? FSALEORDERNO { get; set; }
    //public string? F_ZJXF_YHRQ { get; set; }
    //public string? FXSHTBH { get; set; }

    //public string? FOwnerTypeId { get; set; }
}

 StandardPda/MES.Service/Modes/Womcaa.cs

@@ -9,10 +9,9 @@
public class Womcaa
{
    /// <summary>
    ///     自增列 SEQ_CAA
    ///     自增列
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAA",
        IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAA", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
@@ -307,19 +306,19 @@
    ///     旧物料编码
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_BASEPROPERTY")]
    public string? FWwcBaseproperty { get; set; }
    public string? FwwcBaseproperty { get; set; }

    /// <summary>
    ///     计划完工携带日期
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DATETIME")]
    public DateTime? FWwcDatetime { get; set; }
    public DateTime? FwwcDatetime { get; set; }

    /// <summary>
    ///     生产入库日期
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_SCRKRQ")]
    public DateTime? FWwcScrkrq { get; set; }
    public DateTime? FwwcScrkrq { get; set; }

    /// <summary>
    ///     工时
@@ -331,19 +330,19 @@
    ///     产线人数
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL")]
    public decimal? FWwcDecimal { get; set; }
    public decimal? FwwcDecimal { get; set; }

    /// <summary>
    ///     线别
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_XB")]
    public string? FWwcXb { get; set; }
    public string? FwwcXb { get; set; }

    /// <summary>
    ///     销售员
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_BASE")]
    public string? FWwcBase { get; set; }
    public string? FwwcBase { get; set; }

    /// <summary>
    ///     修改标识
@@ -380,4 +379,142 @@
    /// </summary>
    [SugarColumn(ColumnName = "FNOSTOCKINQTY")]
    public decimal? Fnostockinqty { get; set; }

    /// <summary>
    ///     客户
    /// </summary>
    [SugarColumn(ColumnName = "F_ZSXG_KH")]
    public string? FZsxgKh { get; set; }

    /// <summary>
    ///     要货日期
    /// </summary>
    [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
    public string? FZjxfYhrq { get; set; }

    /// <summary>
    ///     BOM类型
    /// </summary>
    [SugarColumn(ColumnName = "BOMTYPE")]
    public string? Bomtype { get; set; }

    /// <summary>
    ///     BOM母项
    /// </summary>
    [SugarColumn(ColumnName = "BOMMASTER")]
    public decimal? Bommaster { get; set; }

    /// <summary>
    ///     BOM生产目的
    /// </summary>
    [SugarColumn(ColumnName = "BOMALTRNATE")]
    public string? Bomaltrnate { get; set; }

    /// <summary>
    ///     BOM有效日期
    /// </summary>
    [SugarColumn(ColumnName = "BOMEFFEDATE")]
    public string? Bomeffedate { get; set; }

    /// <summary>
    ///     工艺生产目的
    /// </summary>
    [SugarColumn(ColumnName = "ROUTINGALTERNATE")]
    public string? Routingalternate { get; set; }

    /// <summary>
    ///     工艺有效日期
    /// </summary>
    [SugarColumn(ColumnName = "ROUTINGEFFEDATE")]
    public string? Routingeffedate { get; set; }

    /// <summary>
    ///     MRP数量
    /// </summary>
    [SugarColumn(ColumnName = "MRPQTY")]
    public decimal? Mrpqty { get; set; }

    /// <summary>
    ///     业务开始时间
    /// </summary>
    [SugarColumn(ColumnName = "ACTUALSTARTDATE")]
    public DateTime? Actualstartdate { get; set; }

    /// <summary>
    ///     业务结束时间
    /// </summary>
    [SugarColumn(ColumnName = "ACTUALCOMPLETEDATE")]
    public DateTime? Actualcompletedate { get; set; }

    /// <summary>
    ///     来源类型
    /// </summary>
    [SugarColumn(ColumnName = "MOSOURCEDOCTYPE")] 
    public string? Mosourcedoctype { get; set; }

    /// <summary>
    ///     项目
    /// </summary>
    [SugarColumn(ColumnName = "PROJECT")]
    public decimal? Project { get; set; }

    /// <summary>
    ///     货主组织
    /// </summary>
    [SugarColumn(ColumnName = "OWNERORG")]
    public decimal? Ownerorg { get; set; }

    /// <summary>
    ///     创建人
    /// </summary>
    [SugarColumn(ColumnName = "CREATEDBY")]
    public string? Createdby { get; set; }

    /// <summary>
    ///     创建时间
    /// </summary>
    [SugarColumn(ColumnName = "CREATEDON")]
    public DateTime? Createdon { get; set; }

    /// <summary>
    ///     开工数量
    /// </summary>
    [SugarColumn(ColumnName = "TOTALSTARTQTY")]
    public decimal? Totalstartqty { get; set; }

    /// <summary>
    ///     完工数量
    /// </summary>
    [SugarColumn(ColumnName = "TOTALCOMPLETEQTY")]
    public decimal? Totalcompleteqty { get; set; }

    /// <summary>
    ///     入库数量
    /// </summary>
    [SugarColumn(ColumnName = "TOTALRCVQTY")]
    public decimal? Totalrcvqty { get; set; }

    /// <summary>
    ///     返工数量
    /// </summary>
    [SugarColumn(ColumnName = "TOTALREWORKINGQTY")]
    public decimal? Totalreworkingqty { get; set; }

    /// <summary>
    ///     返工原因
    /// </summary>
    [SugarColumn(ColumnName = "REASONFORREWORK")]
    public string? Reasonforrework { get; set; }

    /// <summary>
    ///     强制齐套
    /// </summary>
    [SugarColumn(ColumnName = "ISFORCEWHOLESET")]
    public decimal? Isforcewholeset { get; set; }

    /// <summary>
    ///     1，新增；2，变更
    /// </summary>
    [SugarColumn(ColumnName = "TYPEA")]
    public string? Typea { get; set; }
}

 StandardPda/MES.Service/Modes/Womcab.cs

@@ -11,8 +11,7 @@
    /// <summary>
    ///     自增列
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAB",
        IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAB", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
@@ -187,7 +186,7 @@
    ///     旧物料编码
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_BASEPROPERTY")]
    public string? FWwcBaseproperty { get; set; }
    public string? FwwcBaseproperty { get; set; }

    /// <summary>
    ///     使用比例
@@ -200,20 +199,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "FMATERIALTYPE")]
    public decimal? Fmaterialtype { get; set; }


    /// <summary>
    ///     应发数量
    /// </summary>
    [SugarColumn(ColumnName = "MUST_QTY", ColumnDataType = "NUMBER(18,3)")]
    public decimal? MustQty { get; set; }

    /// <summary>
    ///     用料清单状态（A-创建，B-审核中，C-已审核，D-重新审核，Z-暂存）
    /// </summary>
    [SugarColumn(ColumnName = "TYPEB", Length = 2)]
    public string? TypeB { get; set; }


    /// <summary>
    ///     子项类型（1-标准件 2-返还件 3-替代件）
@@ -232,4 +217,118 @@
    /// </summary>
    [SugarColumn(ColumnName = "FREPLACEGROUP", ColumnDataType = "NUMBER(5,2)")]
    public decimal? FreplaceGroup { get; set; }

    /// <summary>
    ///     应发数量
    /// </summary>
    [SugarColumn(ColumnName = "MUST_QTY", ColumnDataType = "NUMBER(18,3)")]
    public decimal? MustQty { get; set; }

    /// <summary>
    ///     用料清单状态（A-创建，B-审核中，C-已审核，D-重新审核，Z-暂存）
    /// </summary>
    [SugarColumn(ColumnName = "TYPEB", Length = 2)]
    public string? TypeB { get; set; }

    /// <summary>
    ///     项目
    /// </summary>
    [SugarColumn(ColumnName = "PROJECT")]
    public string? Project { get; set; }

    /// <summary>
    ///     BOM需求量
    /// </summary>
    [SugarColumn(ColumnName = "BOMREQQTY")]
    public decimal? Bomreqqty { get; set; }

    /// <summary>
    ///     超额类型
    /// </summary>
    [SugarColumn(ColumnName = "MATERIALTYPE")]
    public string? Materialtype { get; set; }

    /// <summary>
    ///     超额发料
    /// </summary>
    [SugarColumn(ColumnName = "ISOVERISSUE")]
    public decimal? IsOverIssue { get; set; }

    /// <summary>
    ///     超额比例
    /// </summary>
    [SugarColumn(ColumnName = "STANDARD_MATERIALSCALE")]
    public decimal? StandardMaterialscale { get; set; }

    /// <summary>
    ///     固定超额量
    /// </summary>
    [SugarColumn(ColumnName = "FIXEDMATERIALNUM")]
    public decimal? Fixedmaterialnum { get; set; }

    /// <summary>
    ///     替代料
    /// </summary>
    [SugarColumn(ColumnName = "ISSUBSTITUTE")]
    public decimal? IsSubstitute { get; set; }

    /// <summary>
    ///     被替代料品
    /// </summary>
    [SugarColumn(ColumnName = "SUBSTITUTEDITEM")]
    public decimal? Substituteditem { get; set; }

    /// <summary>
    ///     发料单位
    /// </summary>
    [SugarColumn(ColumnName = "ISSUEUOM")]
    public decimal? Issueuom { get; set; }

    /// <summary>
    ///     每装配件数量
    /// </summary>
    [SugarColumn(ColumnName = "QPA")]
    public decimal? Qpa { get; set; }

    /// <summary>
    ///     损耗类型
    /// </summary>
    [SugarColumn(ColumnName = "SCRAPTYPE")]
    public string? Scraptype { get; set; }

    /// <summary>
    ///     倒冲时机
    /// </summary>
    [SugarColumn(ColumnName = "BFOPOPPORTUNITY")]
    public string? Bfopportunity { get; set; }

    /// <summary>
    ///     供应地点
    /// </summary>
    [SugarColumn(ColumnName = "SUPPLYWH")]
    public string? Supplywh { get; set; }

    /// <summary>
    ///     订单开工齐套检查
    /// </summary>
    [SugarColumn(ColumnName = "MOCOMPLETESETCHECK")]
    public decimal? Mocompletesetcheck { get; set; }

    /// <summary>
    ///     订单完工齐套检查
    /// </summary>
    [SugarColumn(ColumnName = "MOSTARTSETCHECK")]
    public decimal? Mostartsetcheck { get; set; }

    /// <summary>
    ///     齐套发料
    /// </summary>
    [SugarColumn(ColumnName = "ISCOUPLEISSUE")]
    public decimal? Iscoupleissue { get; set; }

    /// <summary>
    ///     表行备注
    /// </summary>
    [SugarColumn(ColumnName = "MEMO")]
    public string? FDescription { get; set; }
}

 StandardPda/MES.Service/service/WomcaaManager.cs

@@ -81,8 +81,6 @@
            Erpid = Convert.ToInt64(dto.Id),
            Caa001 = dto.FBillNo,
            Caa021 = dto.FWorkShopID,
            RoutingId = dto.FRoutingId,
            WorkShopId = dto.FREMWorkShopId,
            DepotCode = dto.FStockId,
            CreateDate = dto.FDate,
            Caa004 = dto.FBillType,
@@ -122,8 +120,28 @@
            Caa016 = dto.FDescription,
            //BTBZ = dto.BTBZ,  
            PrdOrg = dto.FPrdOrgId,
            TrustOrg = dto.FEnTrustOrgId
            //Typea = dto.TypeA
            TrustOrg = dto.FEnTrustOrgId,
            Bomtype = dto.FBOMType,
            Bommaster = dto.FBOMMaster,
            Bomaltrnate = dto.FBOMAlternate,
            Bomeffedate = dto.FBOMEffeDate,
            Routingalternate = dto.FRoutingAlternate,
            Routingeffedate = dto.FRoutingEffeDate,
            Mrpqty = dto.FMRPQty,
            Actualstartdate = dto.FActualStartDate,
            Actualcompletedate = dto.FActualCompleteDate,
            Mosourcedoctype = dto.FMOSourceDocType,
            Project = dto.FProject,
            Ownerorg = dto.FOwnerOrg,
            Createdby =  dto.FCreatedBy,
            Createdon = dto.FCreatedOn,
            Totalstartqty =  dto.FTotalStartQty,
            Totalcompleteqty = dto.FTotalCompleteQty,
            Totalrcvqty = dto.FTotalRcvQty,
            Totalreworkingqty = dto.FTotalReworkingQty,
            Reasonforrework = dto.FReasonForRework,
            Isforcewholeset = dto.FIsForceWholeSet, 
            Typea = dto.TypeA
        };


@@ -167,7 +185,6 @@
                PositionNo = dto.FPositionNO,
                SupplyOrganization = dto.FChildSupplyOrgId,
                IssuingOrganization = dto.FSupplyOrg,
                OwnerId = dto.FOwnerID,
                Mtono = dto.FMTONO,
                Lot = dto.FLot,
                DepotCode = dto.FStockID,
@@ -183,7 +200,7 @@
                UseRate = !string.IsNullOrEmpty(dto.FUseRate)
                    ? Convert.ToDecimal(dto.FUseRate)
                    : null,
                MaterialType = dto.FMaterialType,
              
                Cab014 = !string.IsNullOrEmpty(dto.FIsKeyItem)
                    ? Convert.ToInt64(dto.FIsKeyItem)
                    : null,
@@ -205,9 +222,25 @@
                Scraprate = !string.IsNullOrEmpty(dto.FScrapRate)
                    ? Convert.ToDecimal(dto.FScrapRate)
                    : null,
                Project  = dto.FProject,
                Bomreqqty = dto.FBOMReqQty,
                Materialtype = dto.FMaterialType,
                IsOverIssue = dto.FIsOverIssue,
                StandardMaterialscale = dto.FStandardMaterialScale,
                Fixedmaterialnum = dto.FFixedMaterialNum,
                IsSubstitute = dto.FIsSubstitute,
                Substituteditem = dto.FSubstitutedItem,
                Issueuom = dto.FIssueUOM,
                Qpa = dto.FQPA,
                Scraptype = dto.FScrapType,
                Bfopportunity = dto.FBFOpportunity,
                Supplywh = dto.FSupplyWh,
                Mocompletesetcheck = dto.FMOCompleteSetCheck,
                Mostartsetcheck = dto.FMOStartSetCheck,
                Iscoupleissue = dto.FIsCoupleIssue,
                FDescription  = dto.FDescription,
                TypeB = dto.TypeB
                // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr,
                // WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g

            };

            var entity = Db.Queryable<Womcab>()

 StandardPda/MESApplication/appsettings.json

@@ -11,7 +11,7 @@
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    //正式库
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_prd; Password=zmzprd"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
    //测试库（发布时请切换正式库，提交代码勿提交此文件）
    //"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = zmz_test; Password=zmztest"
  }