多组织修改

sjz

3 天以前 f1deb7b024e17cba204de5fcb0dac15801436b90

 MES.Service/service/Warehouse/MesInvItemOutsManager.cs

@@ -68,11 +68,12 @@
    private List<MesInvItemOutItems> getProductionItemsList(
        WarehouseQuery query)
    {
        return Db.Queryable<MesInvItemOutItems, MesItems, MesDepTaskInfo>(
                (c, s, f) => new JoinQueryInfos(
                    JoinType.Inner, c.ItemNo == s.ItemNo,
                    JoinType.Left, f.TaskNo == c.TaskNo && f.ItemNo == c.ItemNo
                ))
        return Db
            .Queryable<MesInvItemOutItems, MesItems,
                MesDepTaskInfo>((c, s, f) => new JoinQueryInfos(
                JoinType.Inner, c.ItemNo == s.ItemNo,
                JoinType.Left, f.TaskNo == c.TaskNo && f.ItemNo == c.ItemNo
            ))
            .Where((c, s, f) => c.ItemOutId == query.id)
            .OrderBy(c => c.Id)
            .Select((c, s, f) => new MesInvItemOutItems
@@ -97,8 +98,8 @@
        WarehouseQuery query)
    {
        return Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>(
                (b, c, d) => new JoinQueryInfos(
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>((b, c, d) =>
                new JoinQueryInfos(
                    JoinType.Left,
                    b.ItemNo == c.ItemNo && b.Company == c.Company &&
                    b.Factory == c.Factory,
@@ -403,8 +404,8 @@
        foreach (var j in itemOutItems)
        {
            // 校验子表对应采购订单的供应商编码
            var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>(
                    (roh, supp) => new JoinQueryInfos(
            var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>((roh, supp) =>
                    new JoinQueryInfos(
                        JoinType.Left,
                        roh.Supplier == supp.Id.ToString()
                    ))
@@ -534,17 +535,16 @@
    public List<MesInvItemOutCDetails> GetScanBarcode(WarehouseQuery query)
    {
        return Db.Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems,
                MesDepots>(
                (b, bar, c, d) => new
                    JoinQueryInfos(
                        JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
                        JoinType.Left, b.ItemNo == c.ItemNo &&
                                       b.Company == c.Company &&
                                       b.Factory == c.Factory,
                        JoinType.Left, b.DepotCode == d.DepotCode &&
                                       b.Company == d.Company &&
                                       b.Factory == d.Factory
                    ))
                MesDepots>((b, bar, c, d) => new
                JoinQueryInfos(
                    JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
                    JoinType.Left, b.ItemNo == c.ItemNo &&
                                   b.Company == c.Company &&
                                   b.Factory == c.Factory,
                    JoinType.Left, b.DepotCode == d.DepotCode &&
                                   b.Company == d.Company &&
                                   b.Factory == d.Factory
                ))
            .Where((b, bar, c, d) => b.ItemOutId == query.id)
            .Select((b, bar, c, d) => new MesInvItemOutCDetails
            {
@@ -831,7 +831,7 @@
        throw new Exception("获取数据失败");
    }

    private MessageCenter ProductionMesToErpParam(WarehouseQuery query)
    public MessageCenter ProductionMesToErpParam(WarehouseQuery query)
    {
        var erpParameters = "";
        var title = "";
@@ -880,11 +880,11 @@

        if (womcaa == null) throw new Exception("任务单号不存在");

        var Departmentcode = Db.Queryable<SysDepartment, MesInvItemOuts>(
                (a, b) =>
                    new JoinQueryInfos(JoinType.Left,
                        a.Departmentname == b.OutPart
                    )).Where((a, b) =>
        var Departmentcode = Db
            .Queryable<SysDepartment, MesInvItemOuts>((a, b) =>
                new JoinQueryInfos(JoinType.Left,
                    a.Departmentname == b.OutPart
                )).Where((a, b) =>
                b.OutPart == mesInvItemOuts.OutPart &&
                b.ItemOutNo == queryBillNo).Select(a => a.Departmentcode)
            .First();
@@ -896,14 +896,14 @@
        if (mesInvItemOuts.Status == 1) throw new Exception("领料单已审核，不能重复推送");

        var C_OUT_ITEMS = Db
            .Queryable<MesInvItemOutItems, Womdab, Womdaa, Womcaa, Womcab>(
                (c, b, d, e, f) =>
                    new JoinQueryInfos(
                        JoinType.Left, b.Id == c.ItemDabid,
                        JoinType.Left, d.Id == b.Pid,
                        JoinType.Left, e.Caa001 == d.Daa021,
                        JoinType.Left, f.Eid == e.Erpid
                    ))
            .Queryable<MesInvItemOutItems, Womdab, Womdaa, Womcaa, Womcab>((c,
                    b, d, e, f) =>
                new JoinQueryInfos(
                    JoinType.Left, b.Id == c.ItemDabid,
                    JoinType.Left, d.Id == b.Pid,
                    JoinType.Left, e.Caa001 == d.Daa021,
                    JoinType.Left, f.Eid == e.Erpid
                ))
            .Where((c, b, d, e, f) => c.ItemOutId == mesInvItemOuts.Id)
            .Select((c, b, d, e, f) => new
            {
@@ -927,28 +927,33 @@
                item.ItemId + "')";
            var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);

            var xsddh = item.Caa015 ?? "";
            var wzh = item.PositionNo ?? "";
            var qty = ((int)item.Quantity).ToString();
            var erpid = ((int)item.erpId).ToString();
            var id = ((int)item.Id).ToString();
            scllentryList.Add(new
            {
                FMaterialId = item.ItemNo,
                FUnitID = C_ITEM_UNIT,
                FAppQty = item.Quantity,
                FActualQty = item.Quantity,
                FAppQty = qty,
                FActualQty = qty,
                FStockId = item.DepotCode,
                FPPBomEntryId = item.erpId,
                F_UNW_Text_xsddh = item.Caa015,
                F_UNW_TEXT_WZH = item.PositionNo,
                F_MES_ENTRYID = item.Id
                FPPBomEntryId = erpid,
                F_UNW_Text_xsddh = xsddh,
                F_UNW_TEXT_WZH = wzh,
                F_MES_ENTRYID = id
            });
        }

        var dataJson = new
        {
            F_MES_ID = mesInvItemOuts.Id,
            FDate = mesInvItemOuts.CreateBy,
            F_MES_ID = mesInvItemOuts.Id.ToString(),
            FDate = DateTime.Now.ToString("yyyy-MM-dd"),
            FPickerId = userName,
            F_UNW_LargeText_BZ = " ",
            F_UNW_KH = " ",
            F_UNW_DDSL = womcaa.Caa012,
            F_UNW_DDSL = womcaa.Caa012.ToString(),
            F_UNW_Text_CZG = userName,
            scllentry = scllentryList
        };