1.携客云获取送货单默认组织写死 2.采购入库优化

南骏 池

2 天以前 20dda69cad210c3b40d643e52ba1cbccec24b392

1.携客云获取送货单默认组织写死
2.采购入库优化

 entity/DeliveryNotice.cs

@@ -278,4 +278,10 @@
    /// </summary>
    [SugarColumn(ColumnName = "last_operate_time")]
    public string LastOperateTime { get; set; }

    /// <summary>
    /// 最后操作时间（时间戳）
    /// </summary>
    [SugarColumn(ColumnName = "org_id")]
    public string orgId { get; set; }
}

 service/Warehouse/MesInvItemInCDetailsManager.cs

@@ -245,9 +245,7 @@
                    CreateDate = DateTime.Now,
                    LastupdateBy = user,
                    LastupdateDate = DateTime.Now,
                    UrgentFlag = itemBarcodeDetails.UrgentFlag.Value
                        ? "1"
                        : "0",
                    UrgentFlag = itemBarcodeDetails.UrgentFlag.GetValueOrDefault() ? "1" : "0",
                    CbillNo = itemBarcodeDetails.BillNo,
                    Fstatus = 0,
                    Status = 0,

 service/Warehouse/MesXkyService.cs

@@ -163,7 +163,8 @@


        noticeList.ForEach(n => n.Id = Guid.NewGuid());
    
        noticeList.ForEach(n => n.orgId = "104554");

        var deliveryNos = noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
        //var noticeIds = noticeList.Select(n => n.Id).ToList(); // 保持GUID类型


 service/Warehouse/MesXkyShdManager.cs

@@ -31,20 +31,22 @@
       // if (diffNum.Diffnum != 0)
       //     throw new Exception($"送货单号【{unity.shdh}】条码未全部打印或未同步，无法收货！");

        var sql2 = @"select D.item_no,
        var sql2 = @"WITH dhmx AS(
    SELECT E.line_k3id,B.paper_bill_no,B.guid,E.quantity FROM dbo.MES_INV_ITEM_ARN B LEFT JOIN MES_INV_ITEM_ARN_DETAIL E ON B.guid = E.parent_Guid
)
select DISTINCT D.item_no,
       D.item_name,
       D.item_model,
       A.delivery_qty                         AS shsl,
       ISNULL(E.quantity, 0)                  as ysl,
       A.delivery_qty - ISNULL(E.quantity, 0) as dssl,
       ISNULL(dhmx.quantity, 0)                  as ysl,
       A.delivery_qty - ISNULL(dhmx.quantity, 0) as dssl,
       A.po_erp_no,
       C.PURCHASE_ORDER_LINE_NUMBER,
       B.GUID AS DDHID
       dhmx.GUID AS DDHID
from DELIVERY_NOTICE_DETAIL A
         LEFT JOIN dbo.MES_INV_ITEM_ARN B on B.paper_bill_no = A.delivery_no
         LEFT JOIN MES_ROH_IN_DATA C ON A.po_line_no = C.EBELN_K3ID
         LEFT JOIN MES_ITEMS D ON C.ITEM_ID = D.item_id
         RIGHT JOIN dbo.MES_INV_ITEM_ARN_DETAIL E on E.parent_Guid = B.guid AND E.line_k3id = A.po_line_no
         LEFT JOIN dhmx ON dhmx.line_k3id  = A.po_line_no AND dhmx.paper_bill_no = A.delivery_no
WHERE A.delivery_no = @shdh";

        var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);