222

schangxiang@126.com

2024-11-26 9ac99af38d377e24fa0e1298a118212974592321

222

 CC/iWareCC_ASRS/WmsTask/PrintHandler.cs

@@ -94,23 +94,23 @@
                    //设置打印机，注意：这里只获取第一个，以后可能要改！
                    _PrinterName = printConfig.PrinterList.Split(',')[0];
                    //根据配置名字查询 打印机名字
                    var printConfigData = mycontext.SysDictData.Where(x => x.Name == _PrinterName).FirstOrDefault();
                    if (printConfigData == null)
                    {
                        errMsg = $"没有找到{_PrinterName.ToString()}的打印机名字！";
                        return;
                    }
                    _PrinterName = printConfigData.Value;
                    //var printConfigData = mycontext.SysDictData.Where(x => x.Name == _PrinterName).FirstOrDefault();
                    //if (printConfigData == null)
                    //{
                    //    errMsg = $"没有找到{_PrinterName.ToString()}的打印机名字！";
                    //    return;
                    //}
                    //_PrinterName = printConfigData.Value;

                    Dictionary<string, object> data = new Dictionary<string, object>();
                    if (printClassifyEnum == PrintClassifyEnum.包装条码)
                    {
                        data.Add("bar", item.SNCode);
                        data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
                        data.Add("supplier", item.SupplierName ?? "");
                        data.Add("unit", item.MaterialUnit ?? "");
                        data.Add("qty", item.Quantity);
                        data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                        //data.Add("bar", item.SNCode);
                        //data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
                        //data.Add("supplier", item.SupplierName ?? "");
                        //data.Add("unit", item.MaterialUnit ?? "");
                        //data.Add("qty", item.Quantity);
                        //data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                    }
                    else
                    {
@@ -135,7 +135,7 @@
                    }
                    else
                    {
                        errMsg = $"打印错误,跟踪码{item.SNCode}，打印机名称{_PrinterName},错误信息：(打印服务返回)" + errMsg;
                        errMsg = $"打印错误 打印机名称{_PrinterName},错误信息：(打印服务返回)" + errMsg;
                        Log4NetHelper.WriteErrorLog(LogType.PrintHandler, errMsg, null);
                        return;
                    }

 CC/iWareSql/WmsDBModel/WmsDBModel.cs

@@ -150,9 +150,7 @@
                .Property(e => e.Height)
                .HasPrecision(10, 3);

            modelBuilder.Entity<wms_record_print>()
                .Property(e => e.Quantity)
                .HasPrecision(10, 3);
          

            modelBuilder.Entity<wms_record_trans>()
                .Property(e => e.SourceQuantity)

 CC/iWareSql/WmsDBModel/wms_record_print.cs

@@ -16,67 +16,46 @@
        public int PrintSource { get; set; }

        [Required]
        [StringLength(255)]
        public string SNCode { get; set; }

        [Required]
        [StringLength(50)]
        public string MaterialCode { get; set; }
        public string PackageCode { get; set; }

        [Required]
        [StringLength(50)]
        public string MaterialName { get; set; }
        [StringLength(60)]
        public string Info4 { get; set; }

        [StringLength(50)]
        public string SupplierCode { get; set; }
        [StringLength(60)]
        public string Info5 { get; set; }

        [StringLength(50)]
        public string SupplierName { get; set; }
        [StringLength(60)]
        public string Info6 { get; set; }

        [Required]
        [StringLength(50)]
        public string MaterialUnit { get; set; }
        [StringLength(60)]
        public string Info7 { get; set; }

        [StringLength(50)]
        public string POUnit { get; set; }
        [StringLength(60)]
        public string Info8 { get; set; }

        public decimal Quantity { get; set; }
        [StringLength(60)]
        public string Info10 { get; set; }

        [StringLength(50)]
        public string OrderNo { get; set; }
        [StringLength(60)]
        public string Info9 { get; set; }

        [StringLength(50)]
        public string RelationNo { get; set; }
        [StringLength(60)]
        public string Info11 { get; set; }

        [StringLength(50)]
        public string OrderNoLineNumber { get; set; }
        [StringLength(60)]
        public string Info12 { get; set; }

        [StringLength(50)]
        public string RelationNoLineNumber { get; set; }
        [StringLength(60)]
        public string Info13 { get; set; }

        [StringLength(50)]
        public string PlaceCode { get; set; }
        [StringLength(60)]
        public string Info14 { get; set; }

        [StringLength(50)]
        public string PlaceName { get; set; }
        public int? Info15 { get; set; }

        [StringLength(50)]
        public string ToAreaCode { get; set; }

        [StringLength(50)]
        public string ToAreaName { get; set; }

        [StringLength(50)]
        public string ToPlaceCode { get; set; }

        [StringLength(50)]
        public string ToPlaceName { get; set; }

        [StringLength(50)]
        public string SourceAreaCode { get; set; }

        [StringLength(50)]
        public string SourceAreaName { get; set; }
        [StringLength(60)]
        public string Info16 { get; set; }

        public int PrintSheetNum { get; set; }


 CC/iWareSql/iWareSql.csproj

@@ -254,6 +254,8 @@
  <ItemGroup>
    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
    <Folder Include="TestDemo\" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>