sjz
2025-04-28 d5e3339a3bf56252ca43fe5143c44b179e877630
SRM接口
已添加17个文件
已重命名2个文件
已修改2个文件
已删除11个文件
2301 ■■■■■ 文件已修改
.vs/HM_JK/v17/.wsuo 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HM_JK/v17/DocumentLayout.json 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/Delivery.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/ErpBarcode.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/ErpDelivery.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/Delivery.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNoteDetail.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/ErpBarcode.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/ErpDelivery.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/SRM/PrintBarcode.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/MES.Service.csproj 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/MesDeliveryNote.cs 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/MesDeliveryNoteBarcode.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/MesDeliveryNoteDetails.cs 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteBarcode.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteDetails.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/resources/Kingdee.CDP.WebApi.SDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/BasicData/Sales/MesDeliveryNoteBarcodeManager.cs 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/BasicData/Sales/MesDeliveryNoteManager.cs 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteDetailsManager.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Config/appsettings.json 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs 260 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs 258 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs 198 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs 195 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteDetailController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/MESApplication.csproj 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HM_JK/v17/.wsuo
Binary files differ
.vs/HM_JK/v17/DocumentLayout.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
{
  "Version": 1,
  "WorkspaceRootPath": "E:\\Tool\\HM\\HM_JK\\",
  "Documents": [],
  "DocumentGroupContainers": [
    {
      "Orientation": 0,
      "VerticalTabListWidth": 256,
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": -1,
          "Children": [
            {
              "$type": "Bookmark",
              "Name": "ST:132:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:133:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:134:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:135:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:138:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:137:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:136:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:141:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:143:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            }
          ]
        }
      ]
    }
  ]
}
StandardInterface/MES.Service/Dto/webApi/Delivery.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Dto/webApi/ErpBarcode.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Dto/webApi/ErpDelivery.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Dto/webApi/SRM/Delivery.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
namespace MES.Service.Dto.webApi.SRM;
public class Delivery
{
    public DeliveryNote DeliveryNote { get; set; }
    public List<DeliveryNoteDetail> DeliveryNoteDetail { get; set; }
}
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
namespace MES.Service.Dto.webApi.SRM;
public class DeliveryNote
{
    public string? Erpid { get; set; }
    public string? DeliveryNo { get; set; }
    public string? SupplierId { get; set; }
    public string? FDate { get; set; }
    public string? Remark { get; set; }
    public string? FReceiveOrgId { get; set; }
}
StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNoteDetail.cs
ÎļþÃû´Ó StandardInterface/MES.Service/Dto/webApi/ErpDeliveryData.cs ÐÞ¸Ä
@@ -1,20 +1,17 @@
namespace MES.Service.Dto.webApi;
namespace MES.Service.Dto.webApi.SRM;
public class ErpDeliveryData
public class DeliveryNoteDetail
{
    public string? DeliveryNo { get; set; }
    public string? LineNo { get; set; }
    public string? FBillNo { get; set; }
    public string? ProductCode { get; set; }
    public string? IncludeQty { get; set; }
    public string? PurchaseQty { get; set; }
    public string? DeliveryQty { get; set; }
    public string? SalesOrderId { get; set; }
    public string? OrderlineId { get; set; }
    public string? IncludeQty { get; set; }
    public string? PurchaseUnit { get; set; }
    public string? InventoryUnit { get; set; }
    public string? FXSHTH { get; set; }
    public string? Remark { get; set; }
    public string? FMtoNo { get; set; }
    public string? FLot { get; set; }
    public string? F_SLTZ_SCTZDA { get; set; }
}
    public string? FBillNo { get; set; }
    public string? OrderlineId { get; set; }
    public string? DepotNo { get; set; }
}
StandardInterface/MES.Service/Dto/webApi/SRM/ErpBarcode.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
namespace MES.Service.Dto.webApi.SRM;
public class ErpBarcode
{
    public string? SmallBarcode { get; set; }
}
StandardInterface/MES.Service/Dto/webApi/SRM/ErpDelivery.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
namespace MES.Service.Dto.webApi.SRM;
public class ErpDelivery
{
    public string? DeliveryNo { get; set; }
}
StandardInterface/MES.Service/Dto/webApi/SRM/PrintBarcode.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
namespace MES.Service.Dto.webApi.SRM;
public class PrintBarcode
{
    public string? DeliveryNo { get; set; }
    public string? LineNo { get; set; }
    public string? SmallBarcode { get; set; }
    public string? ProductCode { get; set; }
    public string? IncludeQty { get; set; }
    public string? OuterBarcode { get; set; }
    public string? BarcodeType { get; set; }
    public string? IsMerge { get; set; }
}
StandardInterface/MES.Service/MES.Service.csproj
@@ -7,8 +7,20 @@
    </PropertyGroup>
    <ItemGroup>
        <PackageReference Include="Masuit.Tools.Core" Version="2024.3.4"/>
        <PackageReference Include="SqlSugarCore" Version="5.1.4.158"/>
        <PackageReference Include="Masuit.Tools.Core" Version="2024.3.4" />
        <PackageReference Include="SqlSugarCore" Version="5.1.4.158" />
    </ItemGroup>
    <ItemGroup>
      <Folder Include="Dto\webApi\SRM\" />
      <Folder Include="Modes\SRM\" />
      <Folder Include="service\SRM\" />
    </ItemGroup>
    <ItemGroup>
      <Reference Include="Kingdee.CDP.WebApi.SDK">
        <HintPath>resources\Kingdee.CDP.WebApi.SDK.dll</HintPath>
      </Reference>
    </ItemGroup>
</Project>
StandardInterface/MES.Service/Modes/MesDeliveryNote.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Modes/MesDeliveryNoteBarcode.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Modes/MesDeliveryNoteDetails.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
using SqlSugar;
namespace MES.Service.Modes.SRM;
//送货单头
[SugarTable("MES_DELIVERY_NOTE")]
public class MesDeliveryNote
{
    //SEQ_DELIVERY
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
    public decimal Id { get; set; }
    //送货单号
    [SugarColumn(ColumnName = "DELIVERY_NO")]
    public string? DeliveryNo { get; set; }
    //供应商内码
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string? SuppNo { get; set; }
    //单据日期
    [SugarColumn(ColumnName = "DELIVERY_DATE")]
    public string? DeliveryDate { get; set; }
    //备注
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }
    //审核标识
    [SugarColumn(ColumnName = "STATUS")]
    public decimal? Status { get; set; }
    //审核人
    [SugarColumn(ColumnName = "CHECK_USER")]
    public string? CheckUser { get; set; }
    //审核日期
    [SugarColumn(ColumnName = "CHECK_DATE")]
    public DateTime? CheckDate { get; set; }
    //收料组织
    [SugarColumn(ColumnName = "SITE")]
    public string? Site { get; set; }
    //创建时间
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    //ERP收料通知单据头内码
    [SugarColumn(ColumnName = "ERP_ID")]
    public string? ErpId { get; set; }
}
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteBarcode.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
using SqlSugar;
namespace MES.Service.Modes.SRM;
//送货单条码表
[SugarTable("MES_DELIVERY_NOTE_BARCODE")]
public class MesDeliveryNoteBarcode
{
    //SEQ_DELIVERY
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY_B")]
    public decimal Id { get; set; }
    //送货单号
    [SugarColumn(ColumnName = "DELIVERY_NO")]
    public string? DeliveryNo { get; set; }
    // ç‰©æ–™ç¼–码
    [SugarColumn(ColumnName = "PRODUCT_CODE")]
    public string? ProductCode { get; set; }
    //物料条码
    [SugarColumn(ColumnName = "SMALL_BARCODE")]
    public string? SmallBarcode { get; set; }
    //条码数量
    [SugarColumn(ColumnName = "INCLUDE_QTY")]
    public decimal? IncludeQty { get; set; }
    //送货单项次
    [SugarColumn(ColumnName = "LINE_NO")]
    public string? LineNo { get; set; }
    //创建时间
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    //供应商
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string? SuppNo { get; set; }
    //箱条码
    [SugarColumn(ColumnName = "OUTER_BARCODE")]
    public string? OuterBarcode { get; set; }
    //条码类型
    [SugarColumn(ColumnName = "BARCODE_TYPE")]
    public string? BarcodeType { get; set; }
    //是否合并
    [SugarColumn(ColumnName = "IS_MERGE")]
    public decimal? IsMegre { get; set; }
}
StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteDetails.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
using SqlSugar;
namespace MES.Service.Modes.SRM;
/// <summary>
///     é€è´§å•明细
/// </summary>
[SugarTable("MES_DELIVERY_NOTE_DETAILS")]
public class MesDeliveryNoteDetails
{
    //SEQ_DELIVERY
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY_D")]
    public decimal Id { get; set; }
    //收料通知单分录内码
    [SugarColumn(ColumnName = "LINE_NO")]
    public decimal? LineNo { get; set; }
    //ERP采购单号
    [SugarColumn(ColumnName = "ERP_NO")]
    public string? ErpNo { get; set; }
    //采购单分录内码
    [SugarColumn(ColumnName = "PO_LINENO")]
    public string? PoLineNo { get; set; }
    //产品内码
    [SugarColumn(ColumnName = "PRODUCT_CODE")]
    public string? ProductCode { get; set; }
    //收料单位
    [SugarColumn(ColumnName = "SL_UNIT")]
    public string? SlUnit { get; set; }
    //库存单位
    [SugarColumn(ColumnName = "KC_UNIT")]
    public string? KcUnit { get; set; }
    //本次应收数量
    [SugarColumn(ColumnName = "DELIVERY_QTY")]
    public decimal? DeliveryQty { get; set; }
    //备注
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }
    //收料通知单
    [SugarColumn(ColumnName = "DELIVERY_NO")]
    public string? DeliveryNo { get; set; }
    //创建日期
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    //采购订单数量
    [SugarColumn(ColumnName = "PURCHASE_QTY")]
    public decimal? PurchaseQty { get; set; }
    //本次交货数量
    [SugarColumn(ColumnName = "INCLUDE_QTY")]
    public decimal? IncludeQty { get; set; }
    //收货仓库
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
}
StandardInterface/MES.Service/resources/Kingdee.CDP.WebApi.SDK.dll
Binary files differ
StandardInterface/MES.Service/service/BasicData/Sales/MesDeliveryNoteBarcodeManager.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/service/BasicData/Sales/MesDeliveryNoteManager.cs
ÎļþÒÑɾ³ý
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,92 @@
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.webApi.SRM;
using MES.Service.Modes.SRM;
using SqlSugar;
public class MesDeliveryNoteBarcodeManager : Repository<MesDeliveryNoteBarcode>
{
    public dynamic Save(PrintBarcode barcode)
    {
        var mesDeliveryBarcode= GetMesDeliveryBarcode(barcode);
        return UseTransaction(db =>
        {
            return SaveOrUpdateData(db, mesDeliveryBarcode) ? 1 : 0;
        }) > 0;
    }
    public dynamic SaveList(List<PrintBarcode> barcode)
    {
        var result = barcode.Select(Save).ToList();
        return result.All(b => b);
    }
    public dynamic DeleteBarcode(ErpBarcode barcode)
    {
        return UseTransaction(db =>
        {
            return DeleteData(db, barcode) ? 1 : 0;
        }) > 0;
    }
    public dynamic DeleteBarcodeList(List<ErpBarcode> barcode)
    {
        var result = barcode.Select(DeleteBarcode).ToList();
        return result.All(b => b);
    }
    // åˆ é™¤æ•°æ®çš„æ–¹æ³•
    private bool DeleteData(SqlSugarScope db, ErpBarcode barcode)
    {
        var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.SmallBarcode == barcode.SmallBarcode).ExecuteCommand() > 0;
        if (del) {
            return true;
        }
        throw new NotImplementedException("删除失败");
    }
    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryBarcode)
    {
        if (mesDeliveryBarcode.Id != null)
        {
            base.DeleteById(mesDeliveryBarcode.Id);
        }
        var orUpdate = base.Insert(mesDeliveryBarcode);
        if (orUpdate)
        {
            return true;
        }
        throw new NotImplementedException("插入或更新失败");
    }
    public MesDeliveryNoteBarcode GetMesDeliveryBarcode(PrintBarcode barcode)
    {
        var mesDeliveryBarcode = new MesDeliveryNoteBarcode();
        var single = base.GetSingle(it => it.SmallBarcode == barcode.SmallBarcode);
        if (single != null)
        {
            mesDeliveryBarcode.Id = single.Id;
        }
        mesDeliveryBarcode.DeliveryNo = barcode.DeliveryNo;
        mesDeliveryBarcode.ProductCode = barcode.ProductCode;
        mesDeliveryBarcode.LineNo = barcode.LineNo;
        mesDeliveryBarcode.SmallBarcode = barcode.SmallBarcode;
        mesDeliveryBarcode.IncludeQty = Convert.ToDecimal(barcode.IncludeQty);
        mesDeliveryBarcode.CreateDate = DateTime.Now;
        mesDeliveryBarcode.OuterBarcode = barcode.OuterBarcode;
        mesDeliveryBarcode.BarcodeType = barcode.BarcodeType;
        mesDeliveryBarcode.IsMegre = Convert.ToDecimal(barcode.IsMerge);
        return mesDeliveryBarcode;
    }
}
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteDetailsManager.cs
ÎļþÃû´Ó StandardInterface/MES.Service/service/BasicData/Sales/MesDeliveryNoteDetailsManager.cs ÐÞ¸Ä
@@ -1,10 +1,10 @@
using MES.Service.DB;
using MES.Service.Modes;

using MES.Service.DB;
using MES.Service.Modes.SRM;
using SqlSugar;
namespace MES.Service.service.BasicData.Sales;
public class MesDeliveryDetailsManager : Repository<MesDeliveryNoteDetails>
public class MesDeliveryNoteDetailsManager : Repository<MesDeliveryNoteDetails>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
@@ -76,4 +76,4 @@
    }
    #endregion
}
}
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@

using MES.Service.DB;
using MES.Service.Dto.webApi.SRM;
using MES.Service.Modes.SRM;
using SqlSugar;
public class MesDeliveryNoteManager : Repository<MesDeliveryNote>{
    private readonly MesDeliveryNoteDetailsManager mesDeliveryNoteManager = new();
    public dynamic Save(Delivery delivery)
    {
        var DeliveryNote = delivery.DeliveryNote;
        var mesDeliveryNote = GetMesDeliveryNote(DeliveryNote);
        var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.DeliveryNoteDetail, DeliveryNote.DeliveryNo);
        return UseTransaction(db =>
        {
            return SaveOrUpdateData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1 : 0;
        }) > 0;
    }
    public dynamic SaveList(List<Delivery> delivery)
    {
        var result = delivery.Select(Save).ToList();
        return result.All(b => b);
    }
    public dynamic DeleteDelivery(ErpDelivery delivery)
    {
        return UseTransaction(db =>
        {
            return DeleteData(db, delivery) ? 1 : 0;
        }) > 0;
    }
    public dynamic DeleteDeliveryList(List<ErpDelivery> delivery)
    {
        var result = delivery.Select(DeleteDelivery).ToList();
        return result.All(b => b);
    }
    // åˆ é™¤æ•°æ®çš„æ–¹æ³•
    private bool DeleteData(SqlSugarScope db, ErpDelivery delivery)
    {
        var update = db.Deleteable<MesDeliveryNote>().Where(s => s.DeliveryNo == delivery.DeliveryNo).ExecuteCommand()>0;
        var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == delivery.DeliveryNo).ExecuteCommand() >= 0;
        if (update && insertOrUpdate) return true;
        throw new NotImplementedException("删除失败,MES中不存在此送货单");
    }
    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote, List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
    {
        if (mesDeliveryNote.Id != null)
        {
            base.DeleteById(mesDeliveryNote.Id);
        }
        if (mesDeliveryNoteDetails.Count > 0)
        {
            db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
        }
        var orUpdate = base.Insert(mesDeliveryNote);
        var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
        if (orUpdate && baOrUpdate) return true;
        throw new NotImplementedException("插入或更新失败");
    }
    public MesDeliveryNote GetMesDeliveryNote(DeliveryNote delivery)
    {
        var mesDeliveryNote = new MesDeliveryNote();
        var single = base.GetSingle(it => it.DeliveryNo == delivery.DeliveryNo);
        if (single != null) mesDeliveryNote.Id = single.Id;
        mesDeliveryNote.ErpId = delivery.Erpid;
        mesDeliveryNote.DeliveryNo = delivery.DeliveryNo;
        mesDeliveryNote.SuppNo = delivery.SupplierId;
        mesDeliveryNote.DeliveryDate = delivery.FDate;
        mesDeliveryNote.Remark = delivery.Remark;
        mesDeliveryNote.Site = delivery.FReceiveOrgId;
        if (single != null)
        {
            mesDeliveryNote.Status = single.Status;
            mesDeliveryNote.CheckUser = single.CheckUser;
            mesDeliveryNote.CheckDate = single.CheckDate;
        }
        else
        {
            mesDeliveryNote.Status = 0;
        }
        mesDeliveryNote.CreateDate = DateTime.Now;
        return mesDeliveryNote;
    }
    public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(List<DeliveryNoteDetail> erpDeliveryDatas, string? type)
    {
        return erpDeliveryDatas.Select(s =>
        {
            var entity = new MesDeliveryNoteDetails
            {
                DeliveryNo = type,
                LineNo = Convert.ToDecimal(s.LineNo),
                ErpNo = s.FBillNo,
                PoLineNo = s.OrderlineId,
                ProductCode = s.ProductCode,
                SlUnit = s.PurchaseUnit,
                KcUnit = s.InventoryUnit,
                DeliveryQty = Convert.ToDecimal(s.DeliveryQty),
                Remark = s.Remark,
                CreateDate = DateTime.Now,
                PurchaseQty = Convert.ToDecimal(s.PurchaseQty),
                IncludeQty = Convert.ToDecimal(s.IncludeQty),
                DepotCode = s.DepotNo
            };
            return entity;
        }).ToList();
    }
}
StandardInterface/MESApplication/Config/appsettings.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
{
  "Logging": {
    "LogLevel": {
      "Default": "Information",
      "Microsoft": "Warning",
      "Microsoft.Hosting.Lifetime": "Information"
    }
  },
  "AllowedHosts": "*",
  "Version": "1.0.0",
  "X-KDApi-AcctID": "61ce591aee4c5a",
  "X-KDApi-UserName": "mes",
  "X-KDApi-AppID": "310228_4f7q68lG0OG9w9XL5e3q0bXqzgQV4toK",
  "X-KDApi-AppSec": "db05ae60d70e4bd0a8bdb974f8030f6f",
  "X-KDApi-LCID": "2052",
  "X-KDApi-ServerUrl": "http://121.36.245.199/K3cloud/"
}
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
ÎļþÒÑɾ³ý
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
ÎļþÒÑɾ³ý
StandardInterface/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
ÎļþÒÑɾ³ý
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,198 @@
using MES.Service.Dto.webApi.SRM;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;
namespace MESApplication.Controllers.DeliveryNote;
[ApiController]
[Route("api/DeliveryBarcode")]
public class MesDeliveryNoteBarcodeController : ControllerBase
{
    private readonly MessageCenterManager _manager = new();
    private readonly MesDeliveryNoteBarcodeManager m = new();
    private readonly string METHOD = "POST";
    private readonly string TableName = "MES_DELIVERY_NOTE_BARCODE";
    private readonly string URL = "http://localhost:10054/api/DeliveryBarcode/";
    [HttpPost("Save")]
    public ResponseResult Save(PrintBarcode barcode)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(barcode);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            PrintBarcode save = m.Save(barcode);
            resultInfos = save;
            entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<PrintBarcode> barcode)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "SaveList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(barcode);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.SaveList(barcode);
            resultInfos = save;
            entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("Delete")]
    public ResponseResult Delete(ErpBarcode barcode)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Delete";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(barcode);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteBarcode(barcode);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("DeleteList")]
    public ResponseResult DeleteList(List<ErpBarcode> barcode)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(barcode);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteBarcodeList(barcode);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
}
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,195 @@
using MES.Service.Dto.webApi.SRM;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using System.Dynamic;
namespace MESApplication.Controllers.DeliveryNote;
[ApiController]
[Route("api/DeliveryNote")]
public class MesDeliveryNoteController : ControllerBase
{
    private readonly MessageCenterManager _manager = new();
    private readonly MesDeliveryNoteManager m = new();
    private readonly string METHOD = "POST";
    private readonly string TableName = "MES_DELIVERY_NOTE";
    private readonly string URL = "http://localhost:10054/api/MesDelivery/";
    [HttpPost("Save")]
    public ResponseResult Save(Delivery delivery)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(delivery);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<Delivery> delivery)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "SaveList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.SaveList(delivery);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("Delete")]
    public ResponseResult Delete(ErpDelivery delivery)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Delete";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteDelivery(delivery);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("DeleteList")]
    public ResponseResult DeleteList(List<ErpDelivery> delivery)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(delivery);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteDeliveryList(delivery);
            resultInfos.tbBillList = save;
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
}
StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteDetailController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
using Microsoft.AspNetCore.Mvc;
namespace MESApplication.Controllers.DeliveryNote;
public class MesDeliveryNoteDetailController : ControllerBase
{
}
StandardInterface/MESApplication/MESApplication.csproj
@@ -9,7 +9,7 @@
    </PropertyGroup>
    <ItemGroup>
        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0"/>
        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,12 +18,16 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121"/>
        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
        <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\MES.Service\MES.Service.csproj"/>
        <ProjectReference Include="..\MES.Service\MES.Service.csproj" />
    </ItemGroup>
    <ItemGroup>
      <Folder Include="Controllers\SRM\" />
    </ItemGroup>
</Project>