测试生产订单添加行id，srm送货加route

hao

2025-05-23 db8dbafae693a62e9fe901adabfc4adcdbd92f7b

测试生产订单添加行id，srm送货加route

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

@@ -62,6 +62,7 @@
    public string? TypeA { get; set; }               //单据状态
    public string? RK_ORG { get; set; }               //入库组织
    public string? RCN { get; set; }               //日产能
    public string? CG_LINE_ID { get; set; }               //采购订单行id


    ////委外字段

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs

@@ -8,4 +8,5 @@
    public string? FDate { get; set; }
    public string? Remark { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? Is_SRM { get; set; }
}

 StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs

@@ -41,6 +41,9 @@
    //收料组织
    [SugarColumn(ColumnName = "SITE")]
    public string? Site { get; set; }
    //是否SRM
    [SugarColumn(ColumnName = "IS_SRM")]
    public string? Issrm { get; set; }

    //创建时间
    [SugarColumn(ColumnName = "CREATE_DATE")]

 StandardInterface/MES.Service/Modes/Womcaa.cs

@@ -419,6 +419,11 @@
        /// 客户 
        ///</summary>
         [SugarColumn(ColumnName="F_ZSXG_KH"    )]
         public string FZsxgKh { get; set; }
         public string FZsxgKh { get; set; }  
        /// <summary>
        /// 采购订单行id 
        ///</summary>
         [SugarColumn(ColumnName= "CG_LINE_ID")]
         public string Cglineid { get; set; }
    }
}

 StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs

@@ -15,6 +15,7 @@
        {
            get
            {
                //string json = "{\"ap1\":{ \"AcctID\":\"" + "68044981e73323" + "\",\"Username\":\"广深\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
                string json = "{\"ap1\":{ \"AcctID\":\"" + "6533e4ab79156b" + "\",\"Username\":\"广深\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
                var resp = GetResponse("http://47.96.178.105/k3cloud/Kingdee.BOS.ServiceFacade.ServicesStub.User.UserService.ValidateLoginInfo.common.kdsvc", json, new Dictionary<string, string>());
                string ret = (new StreamReader(resp.GetResponseStream(), Encoding.UTF8)).ReadToEnd();

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs

@@ -78,6 +78,7 @@
        mesDeliveryNote.DeliveryDate = delivery.FDate;
        mesDeliveryNote.Remark = delivery.Remark;
        mesDeliveryNote.Site = delivery.FReceiveOrgId;
        mesDeliveryNote.Issrm=delivery.Is_SRM;
        if (single != null)
        {
            mesDeliveryNote.Status = single.Status;

 StandardInterface/MES.Service/service/WomcaaManager.cs

@@ -60,7 +60,7 @@
            .IgnoreColumns(true).ExecuteCommand() > 0;

        //批量插入忽略空字段
        var baOrUpdate = db.Insertable(mesWomcabs).PageSize(1)
        var baOrUpdate = db.Insertable(mesWomcabs).PageSize(10)
            .IgnoreColumnsNull()
            .ExecuteCommand() > 0;

@@ -201,7 +201,7 @@
            Typea = dto.TypeA, ///     单据状态
            RkOrg = dto.RK_ORG,           //入库组织
            Rcn=dto.RCN,                 //日产能

            Cglineid=dto.CG_LINE_ID, //采购订单行id

            //沃尔新增
            // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD

 StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs

@@ -121,6 +121,7 @@
        entity.Data = JsonConvert.SerializeObject(barcode);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = barcode.SmallBarcode; 
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs

@@ -118,6 +118,7 @@
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route= delivery.DeliveryNo;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/WomcaaController.cs

@@ -32,6 +32,7 @@
        entity.Data = JsonConvert.SerializeObject(rohIn);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = rohIn.ErpCaa.FBillNo; 
        try
        {
            dynamic resultInfos = new ExpandoObject();