1.获取携客云条码

南骏 池

2025-05-20 cb689799ee3c847eca78052473312aea3be37518

1.获取携客云条码

 Dto/Xky/XkyBarcodeDataDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
using Newtonsoft.Json;

namespace NewPdaSqlServer.Dto.Xky
{
    public class XkyBarcodeDataDto
    {
        [JsonProperty("poErpNo")]
        public string PoErpNo { get; set; }

        [JsonProperty("poLineNo")]
        public string PoLineNo { get; set; }

        [JsonProperty("productCode")]
        public string ProductCode { get; set; }

        [JsonProperty("productName")]
        public string ProductName { get; set; }

        [JsonProperty("productScale")]
        public string ProductScale { get; set; }

        [JsonProperty("smallBarcode")]
        public string SmallBarcode { get; set; }

        [JsonProperty("bigBarcode")]
        public string BigBarcode { get; set; }

        [JsonProperty("outerBarcode")]
        public string OuterBarcode { get; set; }

        [JsonProperty("includeQty")]
        public int IncludeQty { get; set; }

        [JsonProperty("smallPackageLength")]
        public int? SmallPackageLength { get; set; }

        [JsonProperty("smallPackageWidth")]
        public int? SmallPackageWidth { get; set; }

        [JsonProperty("smallPackageHeight")]
        public int? SmallPackageHeight { get; set; }

        [JsonProperty("bigPackageLength")]
        public int? BigPackageLength { get; set; }

        [JsonProperty("bigPackageWidth")]
        public int? BigPackageWidth { get; set; }

        [JsonProperty("bigPackageHeight")]
        public int? BigPackageHeight { get; set; }

        [JsonProperty("outerPackageLength")]
        public int? OuterPackageLength { get; set; }

        [JsonProperty("outerPackageWidth")]
        public int? OuterPackageWidth { get; set; }

        [JsonProperty("outerPackageHeight")]
        public int? OuterPackageHeight { get; set; }

        [JsonProperty("smallPackageSn")]
        public string SmallPackageSn { get; set; }

        [JsonProperty("bigPackageSn")]
        public string BigPackageSn { get; set; }

        [JsonProperty("outerPackageSn")]
        public string OuterPackageSn { get; set; }

        [JsonProperty("dnLines")]
        public string DnLines { get; set; }

        [JsonProperty("dynamicData")]
        public XkyDynamicDataDto DynamicData { get; set; }

        [JsonProperty("createType")]
        public int CreateType { get; set; }

        [JsonProperty("packLevel")]
        public int PackLevel { get; set; }
    }

    public class XkyDynamicDataDto
    {
        [JsonProperty("poErpNo")]
        public string PoErpNo { get; set; }

        [JsonProperty("poLineNo")]
        public string PoLineNo { get; set; }

        [JsonProperty("innerVendorCode")]
        public string InnerVendorCode { get; set; }

        [JsonProperty("customize1")]
        public string Customize1 { get; set; }

        [JsonProperty("customize2")]
        public string Customize2 { get; set; } // æ³¨æ„ï¼šJSON中这里是数字1747584000000

        [JsonProperty("customize3")]
        public string Customize3 { get; set; }
    }
}

 entity/TblBarcodeInformation.cs

@@ -1,8 +1,8 @@
using SqlSugar;
using System;

namespace MES.Service.Models;

namespace MES.Service.Models
{
/// <summary>
/// æºå®¢äº‘条码信息表
/// </summary>
@@ -117,6 +117,12 @@
    [SugarColumn(ColumnName = "out_package_sn")]
    public string OutPackageSn { get; set; }

        ///// <summary>
        ///// æ¡ç è§„则中对应的动态字段的值
        ///// </summary>
        //[SugarColumn(ColumnName = "dynamic_data")]
        //public string DynamicData { get; set; }

    /// <summary>
    /// åŒ…装层级
    /// </summary>
@@ -148,10 +154,10 @@
    public string PoErpNo { get; set; }

    /// <summary>
    /// é¡¹ç›®(单身extendN01)
        /// é€è´§å•é¡¹æ¬¡
    /// </summary>
    [SugarColumn(ColumnName = "extend_n01")]
    public string ExtendN01 { get; set; }
        [SugarColumn(ColumnName = "dnLines")]
        public string DnLines { get; set; }

    /// <summary>
    /// è®¢å•é¡¹æ¬¡(ERP)
@@ -166,15 +172,27 @@
    public string InnerVendorCode { get; set; }

    /// <summary>
    /// ç”Ÿäº§æ—¥æœŸï¼ˆè‡ªå®šä¹‰å­—段customize1）
        /// è‡ªå®šä¹‰å­—段1（X）
    /// </summary>
    [SugarColumn(ColumnName = "customize1")]
    public string Customize1 { get; set; }


    /// <summary>
    /// åŒæ­¥æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
    public DateTime? SynchronousDate { get; set; }

        /// <summary>
        /// ç”Ÿäº§æ—¥æœŸ
        /// </summary>
        [SugarColumn(ColumnName = "customize2")]
        public string Customize2 { get; set; }

        /// <summary>
        /// æœ‰æ•ˆæœŸ
        /// </summary>
        [SugarColumn(ColumnName = "customize3")]
        public string Customize3 { get; set; }
    }
}

 service/Warehouse/MesXkyService.cs

@@ -8,8 +8,7 @@
using System.Net;
using System.Net.Http.Headers;
using System.Text;
using System.Data.SqlClient;
using System.Data;
using NewPdaSqlServer.Dto.Xky;
using static NewPdaSqlServer.Controllers.Warehouse.MesXkyController;

namespace NewPdaSqlServer.service.QC;
@@ -470,20 +469,53 @@
    private int SaveDeliveryNoticeBar(dynamic responseJson,string deliveryNo)
    {
        var result = 1;
        List<TblBarcodeInformation> noticeList = JsonConvert.DeserializeObject<List<TblBarcodeInformation>>(responseJson.dataList.ToString());
        List<XkyBarcodeDataDto> noticeList = JsonConvert.DeserializeObject<List<XkyBarcodeDataDto>>(responseJson.dataList.ToString());
        
        // æ–°å¢žåˆ—表空值检查
        if (noticeList == null || !noticeList.Any() || noticeList.Count < 1)
        if (noticeList == null || !noticeList.Any())
        {
            _logMessageDhdBar += $"条码数据为空，送货单号：{deliveryNo}";
            return result;
        }

        // èµ‹å€¼guid和到货单号
        noticeList.ForEach(n => n.Id = Guid.NewGuid());
        noticeList.ForEach(n => n.DeliveryNo = deliveryNo);
        noticeList.ForEach(n => n.SynchronousDate = DateTime.Now);
        var barcodeList = noticeList.Select(n => new TblBarcodeInformation
        {
            Id = Guid.NewGuid(),
            DeliveryNo = deliveryNo,
            SynchronousDate = DateTime.Now,

            // ç›´æŽ¥æ˜ å°„字段
            ProductCode = n.ProductCode,
            SmallBarcode = n.SmallBarcode,
            BigBarcode = n.BigBarcode,
            OuterBarcode = n.OuterBarcode,
            IncludeQty = n.IncludeQty.ToString(),
            SmallPackageSn = n.SmallPackageSn,
            BigPackageSn = n.BigPackageSn,
            OutPackageSn = n.OuterPackageSn,
            PackLevel = n.PackLevel.ToString(),

            // å°ºå¯¸å­—段映射
            SmallPackageLength = n.SmallPackageLength?.ToString(),
            SmallPackageWidth = n.SmallPackageWidth?.ToString(),
            SmallPackageHeight = n.SmallPackageHeight?.ToString(),
            BigPackageLength = n.BigPackageLength?.ToString(),
            BigPackageWidth = n.BigPackageWidth?.ToString(),
            BigPackageHeight = n.BigPackageHeight?.ToString(),
            OuterPackageLength = n.OuterPackageLength?.ToString(),
            OuterPackageWidth = n.OuterPackageWidth?.ToString(),
            OuterPackageHeight = n.OuterPackageHeight?.ToString(),

            // åŠ¨æ€å­—段映射
            PoErpNo = n.DynamicData?.PoErpNo ?? n.PoErpNo,
            PoLineNo = n.DynamicData?.PoLineNo ?? n.PoLineNo,
            InnerVendorCode = n.DynamicData?.InnerVendorCode,
            Customize1 = n.DynamicData?.Customize1,
            Customize2 = n.DynamicData?.Customize2,
            Customize3 = n.DynamicData?.Customize3,

            // å…¶ä»–字段
            DnLines = n.DnLines // æ ¹æ®æ•°æ®åº“注释，ExtendN01对应项目(单身extendN01)，这里映射dnLines
        }).ToList();

        Db.Ado.UseTran(() =>
        {
@@ -492,8 +524,8 @@
            .Where(d => d.DeliveryNo == deliveryNo)
              .ExecuteCommand();

            // æ‰¹é‡æ’入优化
            result = Db.Fastest<TblBarcodeInformation>().BulkCopy(noticeList);
            // æ‰¹é‡æ’入优化（使用正确的barcodeList）
            result = Db.Fastest<TblBarcodeInformation>().BulkCopy(barcodeList);
        },
        ex => {
            // å¢žå¼ºå¼‚常信息