hao
2025-05-14 9e9dbf388afbdad4d57ecb7b0e21b7d521177034
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
            };