From 97a9ad53c6d1ac097f46f0b5d4d4d53547c9efe4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 21 十一月 2025 16:18:21 +0800
Subject: [PATCH] 1
---
项目代码/Print/Print/Print/Controllers/PrintController.cs | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/Print/Print/Print/Controllers/PrintController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/Print/Print/Print/Controllers/PrintController.cs"
index 80e043a..d7208f1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/Print/Print/Print/Controllers/PrintController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/Print/Print/Print/Controllers/PrintController.cs"
@@ -3,6 +3,9 @@
using FastReport.Table;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.Text.Json;
+using System.Text.Json.Serialization;
namespace Print.Controllers
{
@@ -12,8 +15,9 @@
{
const string PrintName = "Deli DL-888B(NEW)";
[HttpGet, HttpPost, Route("PrintInboundOrder"), AllowAnonymous]
- public object PrintInboundOrder([FromBody] List<InboundOrder> inbounds)
+ public object PrintInboundOrder([FromBody][ValidateNever] List<InboundOrder> inbounds)
{
+ Console.WriteLine($"{JsonSerializer.Serialize(inbounds)}");
try
{
foreach (var inbound in inbounds)
@@ -64,7 +68,7 @@
TableCell QuantityObj = report.FindObject("Quantity") as TableCell;
if (QuantityObj != null)
{
- QuantityObj.Text = inbound.Quantity.ToString();
+ QuantityObj.Text = inbound.Quantity.ToString("0");
}
TableCell ProductDrawingNumberObj = report.FindObject("ProductDrawingNumber") as TableCell;
if (ProductDrawingNumberObj != null)
@@ -81,14 +85,26 @@
{
WeightObj.Text = inbound.Weight.ToString();
}
+ TableCell DemandClassification = report.FindObject("DemandClassification") as TableCell;
+ if (DemandClassification != null)
+ {
+ if (inbound.DemandClassification == null || inbound.DemandClassification=="")
+ {
+ DemandClassification.Text = " ";
+ }
+ else
+ {
+ DemandClassification.Text = inbound.DemandClassification;
+ }
+ }
report.Print();
report.Dispose();
}
- return new { code = 200, status = false };
+ return new { Code = 200, Status = true , Message = "鎵撳嵃鎴愬姛" };
}
catch (Exception ex)
{
- return ex.Message;
+ return new { Code = 400, Status = false, Message = "鎵撳嵃澶辫触锛岃鏌ョ湅鏄惁杩炴帴鎵撳嵃鏈�" };
}
}
@@ -115,11 +131,11 @@
report.Print();
report.Dispose();
}
- return new { code = 200, status = false };
+ return new { Code = 400, Status = false, Message = "鎵撳嵃鎴愬姛" };
}
catch (Exception ex)
{
- return ex.Message;
+ return new { Code = 400, Status = false, Message = "鎵撳嵃澶辫触锛岃鏌ョ湅鏄惁杩炴帴鎵撳嵃鏈�" };
}
}
@@ -127,16 +143,17 @@
public class InboundOrder
{
public string OrderNo { get; set; }
+ public string? DemandClassification { get; set; }
public string UpperOrderNo { get; set; }
public string WarehouseName { get; set; }
public string MaterialNo { get; set; }
- public string MaterialName { get; set; }
- public string Specs { get; set; }
- public string Unit { get; set; }
+ public string? MaterialName { get; set; }
+ public string? Specs { get; set; }
+ public string? Unit { get; set; }
public decimal Quantity { get; set; }
- public string ProductDrawingNumber { get; set; }
- public string Datetime { get; set; }
- public decimal Weight { get; set; }
+ public string? ProductDrawingNumber { get; set; }
+ public string? Datetime { get; set; }
+ public decimal? Weight { get; set; }
}
}
}
--
Gitblit v1.9.3