From f95dd1ce548f2a465d13f70fe4616410a4d77cc5 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 14 五月 2025 08:45:58 +0800
Subject: [PATCH] 1.OA接口优化。 2.携客云接口调用 3.携客云送货单、送货明细、条码信息实体
---
Controllers/QC/OAJyController.cs | 2
entity/DeliveryNotice.cs | 275 +++++++++++++++++
entity/TblBarcodeInformation.cs | 179 +++++++++++
Controllers/Warehouse/MesXkyController.cs | 12
service/QC/OaApi.cs | 2
entity/DeliveryNoticeDetail.cs | 436 +++++++++++++++++++++++++++
service/Warehouse/MesXkyService.cs | 41 +
7 files changed, 932 insertions(+), 15 deletions(-)
diff --git a/Controllers/QC/OAJyController.cs b/Controllers/QC/OAJyController.cs
index fe1f2df..2e2234e 100644
--- a/Controllers/QC/OAJyController.cs
+++ b/Controllers/QC/OAJyController.cs
@@ -1,4 +1,4 @@
-锘縰sing System.Dynamic;
+using System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
diff --git a/Controllers/Warehouse/MesXkyController.cs b/Controllers/Warehouse/MesXkyController.cs
index 0788b71..e4ae909 100644
--- a/Controllers/Warehouse/MesXkyController.cs
+++ b/Controllers/Warehouse/MesXkyController.cs
@@ -12,15 +12,23 @@
[ApiController]
public class MesXkyController : ControllerBase
{
+
+ public class XKYGetDhdRequest
+ {
+ public long? startDate { get; set; }
+ public long? endDate { get; set; }
+ public string? erpCode { get; set; }
+ }
+
MesXkyService m = new MesXkyService();
[HttpPost("GetXkyDhd")]
- public ResponseResult GetXkyDhd([FromBody] string JsonObj)
+ public ResponseResult GetXkyDhd( XKYGetDhdRequest request)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos = m.GetXkyDHD(JsonObj);
+ resultInfos = m.GetXkyDHD(request);
var tbBillList = resultInfos;
return new ResponseResult
{
diff --git a/entity/DeliveryNotice.cs b/entity/DeliveryNotice.cs
new file mode 100644
index 0000000..8fc7a8d
--- /dev/null
+++ b/entity/DeliveryNotice.cs
@@ -0,0 +1,275 @@
+锘縰sing SqlSugar;
+using System;
+
+namespace MES.Service.Models;
+
+/// <summary>
+/// 閫佽揣閫氱煡鍗曚富琛�
+/// </summary>
+[SugarTable("DELIVERY_NOTICE")]
+public class DeliveryNotice
+{
+ /// <summary>
+ /// 涓婚敭Guid
+ /// </summary>
+ [SugarColumn(ColumnName = "id")]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_no")]
+ public string DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "inner_vendor_code")]
+ public string InnerVendorCode { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "inner_vendor_name")]
+ public string InnerVendorName { get; set; }
+
+ /// <summary>
+ /// 閫佽揣绫诲瀷锛�1-鏅�� 2-琛ヨ揣 3-澶囧搧 4-鏍峰搧 5-VMI
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_type")]
+ public string DeliveryType { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鏃ユ湡锛堟椂闂存埑锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_date")]
+ public string DeliveryDate { get; set; }
+
+ /// <summary>
+ /// 棰勮閫佽揪鏃ユ湡锛堟椂闂存埑锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_arrived_date")]
+ public string PlanArrivedDate { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鑱旂郴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "contact_persion")]
+ public string ContactPerson { get; set; }
+
+ /// <summary>
+ /// 閫佽揣浜鸿仈绯荤數璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "contact_mobile")]
+ public string ContactMobile { get; set; }
+
+ /// <summary>
+ /// 鍐呴儴鏀惰揣鍦扮偣缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "address_code")]
+ public string AddressCode { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏄庣粏鍦板潃
+ /// </summary>
+ [SugarColumn(ColumnName = "address_info")]
+ public string AddressInfo { get; set; }
+
+ /// <summary>
+ /// 閫佽揣杞︾墝鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_car_no")]
+ public string DeliveryCarNo { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "remark")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 鐘舵��:1-寰呯鏀� 2-绛炬敹涓� 3-宸插畬鎴� 4-鎾ゅ洖 8-宸蹭綔搴� 5-鐢宠涓� 7-鍚屾剰 9-閮ㄥ垎鍚屾剰 10-宸插喕缁� 11-鐢宠鎾ゅ洖
+ /// </summary>
+ [SugarColumn(ColumnName = "status")]
+ public string Status { get; set; }
+
+ /// <summary>
+ /// 鐩磋繍鏍囪瘑:1-鏄� 0-鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "direct_delivery_flag")]
+ public string DirectDeliveryFlag { get; set; }
+
+ /// <summary>
+ /// 鐗╂祦鐘舵��:0-鏈彂鍑� 1-宸插彂璐� 2-宸插埌璐�
+ /// </summary>
+ [SugarColumn(ColumnName = "logistics_status")]
+ public string LogisticsStatus { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝竴娆″彂甯冩椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "publish_time")]
+ public string PublishTime { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝竴娆℃洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "update_time")]
+ public string UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒╂鼎涓績缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "profit_center_code")]
+ public string ProfitCenterCode { get; set; }
+
+ /// <summary>
+ /// 鏁村崟姣涢噸
+ /// </summary>
+ [SugarColumn(ColumnName = "gross_weight")]
+ public string GrossWeight { get; set; }
+
+ /// <summary>
+ /// 鏁村崟鍑�閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "net_weight")]
+ public string NetWeight { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺鍗曚綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "unit_weight_code")]
+ public string UnitWeightCode { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺鍗曚綅鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "unit_weight_name")]
+ public string UnitWeightName { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呮暟
+ /// </summary>
+ [SugarColumn(ColumnName = "total_packing_qty")]
+ public string TotalPackingQty { get; set; }
+
+ /// <summary>
+ /// 鎵嬪伐濉啓鎬诲寘鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "total_package_quantity")]
+ public string TotalPackageQuantity { get; set; }
+
+ /// <summary>
+ /// 杩愯緭鏂瑰紡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "transport_type_code")]
+ public string TransportTypeCode { get; set; }
+
+ /// <summary>
+ /// 杩愯緭鏂瑰紡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "transport_type_name")]
+ public string TransportTypeName { get; set; }
+
+ /// <summary>
+ /// 鍖呰鏂瑰紡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "packing_way_code")]
+ public string PackingWayCode { get; set; }
+
+ /// <summary>
+ /// 鍖呰鏂瑰紡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "packing_way_name")]
+ public string PackingWayName { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n01")]
+ public string ExtendN01 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n02")]
+ public string ExtendN02 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n03")]
+ public string ExtendN03 { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵╁睍瀛楁4
+ /// </summary>
+ [SugarColumn(ColumnName = "platform_extend_n04")]
+ public string PlatformExtendN04 { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵╁睍瀛楁5
+ /// </summary>
+ [SugarColumn(ColumnName = "platform_extend_n05")]
+ public string PlatformExtendN05 { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵╁睍瀛楁6
+ /// </summary>
+ [SugarColumn(ColumnName = "platform_extend_n06")]
+ public string PlatformExtendN06 { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵╁睍瀛楁7
+ /// </summary>
+ [SugarColumn(ColumnName = "platform_extend_n07")]
+ public string PlatformExtendN07 { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵╁睍瀛楁8
+ /// </summary>
+ [SugarColumn(ColumnName = "platform_extend_n08")]
+ public string PlatformExtendN08 { get; set; }
+
+ /// <summary>
+ /// 璐х墿閫佽揪鏃ユ湡锛堟椂闂存埑锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "cargo_delivery_time")]
+ public string CargoDeliveryTime { get; set; }
+
+ /// <summary>
+ /// 鐗╂祦鏂瑰紡:1-渚涘簲鍟嗛�佽揣 2-蹇�� 3-閲囪喘鏂硅嚜鎻�
+ /// </summary>
+ [SugarColumn(ColumnName = "logistics_type")]
+ public string LogisticsType { get; set; }
+
+ /// <summary>
+ /// 鐗╂祦鏂瑰紡涓枃灞曠ず
+ /// </summary>
+ [SugarColumn(ColumnName = "logistics_type_show")]
+ public string LogisticsTypeShow { get; set; }
+
+ /// <summary>
+ /// 鐗╂祦鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "logistics_number")]
+ public string LogisticsNumber { get; set; }
+
+ /// <summary>
+ /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
+ /// </summary>
+ [SugarColumn(ColumnName = "first_check")]
+ public string FirstCheck { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "create_date")]
+ public DateTime CreateDate { get; set; } = DateTime.Now;
+
+ /// <summary>
+ /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
+ /// </summary>
+ [SugarColumn(ColumnName = "last_operate_time")]
+ public string LastOperateTime { get; set; }
+}
\ No newline at end of file
diff --git a/entity/DeliveryNoticeDetail.cs b/entity/DeliveryNoticeDetail.cs
new file mode 100644
index 0000000..5997af0
--- /dev/null
+++ b/entity/DeliveryNoticeDetail.cs
@@ -0,0 +1,436 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Models;
+
+/// <summary>
+/// 閫佽揣閫氱煡鍗曟嵁鏄庣粏琛�
+/// </summary>
+[SugarTable("DELIVERY_NOTICE_DETAIL")]
+public class DeliveryNoticeDetail
+{
+ /// <summary>
+ /// 涓婚敭Guid锛圫EQ_XKY锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "id")]
+ public string Id { get; set; }
+
+ /// <summary>
+ /// 椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "line_no")]
+ public string LineNo { get; set; }
+
+ /// <summary>
+ /// ERP閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "po_erp_no")]
+ public string PoErpNo { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曠被鍨� 1锛氫竴鑸噰璐紱2锛氬澶栭噰璐�
+ /// </summary>
+ [SugarColumn(ColumnName = "purchase_type")]
+ public string PurchaseType { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曢」娆�
+ /// </summary>
+ [SugarColumn(ColumnName = "po_line_no")]
+ public string PoLineNo { get; set; }
+
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "product_code")]
+ public string ProductCode { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "product_name")]
+ public string ProductName { get; set; }
+
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "product_scale")]
+ public string ProductScale { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣鍗曚綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_unit_code")]
+ public string DeliveryUnitCode { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣鍗曚綅鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_unit_name")]
+ public string DeliveryUnitName { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_qty")]
+ public string DeliveryQty { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_valuation_qty")]
+ public string DeliveryValuationQty { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣浜у搧鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "price")]
+ public string Price { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣浜у搧鍚◣鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "tax_price")]
+ public string TaxPrice { get; set; }
+
+ /// <summary>
+ /// 鎺掔▼鑷畾涔夐」鐨勫��
+ /// </summary>
+ [SugarColumn(ColumnName = "sch_dynamic_value")]
+ public string SchDynamicValue { get; set; }
+
+ /// <summary>
+ /// 鎺掔▼鎵规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_batch_no")]
+ public string ScheduleBatchNo { get; set; }
+
+ /// <summary>
+ /// 鎺掔▼鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_order_no")]
+ public string ScheduleOrderNo { get; set; }
+
+ /// <summary>
+ /// 瀵瑰簲鎺掔▼ItemDetail鐨勪富閿垪
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_detail_no")]
+ public string ScheduleDetailNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎬ユ枡 0:鍚� ; 1锛氭槸
+ /// </summary>
+ [SugarColumn(ColumnName = "urgent_flag")]
+ public string UrgentFlag { get; set; }
+
+ /// <summary>
+ /// 鍘熷鍗曟嵁绫诲瀷 1锛氳鍗曪紱2锛氭帓绋嬶紱3锛氶��璐э紱4锛氬鍝�
+ /// </summary>
+ [SugarColumn(ColumnName = "src_bill_type")]
+ public string SrcBillType { get; set; }
+
+ /// <summary>
+ /// 閲囪喘椤规鐨勯噰璐鏄庝俊鎭�
+ /// </summary>
+ [SugarColumn(ColumnName = "purchase_desc")]
+ public string PurchaseDesc { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁澶囨敞锛宻rcBillType=1 瀵瑰簲閲囪喘璁㈠崟鍗曡韩鐨勫娉紱srcBillType=2 瀵瑰簲鎺掔▼椤规鐨勫娉�
+ /// </summary>
+ [SugarColumn(ColumnName = "src_order_line_remark")]
+ public string SrcOrderLineRemark { get; set; }
+
+ /// <summary>
+ /// 鐘舵�侊紙1:寰呯鏀讹紱2:绛炬敹涓紱3:宸插畬鎴愶級
+ /// </summary>
+ [SugarColumn(ColumnName = "status")]
+ public string Status { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鐘舵�侊紙0-鏈敹璐э紱1-閮ㄥ垎鏀惰揣锛�2-鍏ㄩ儴鏀惰揣锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "receive_status")]
+ public string ReceiveStatus { get; set; }
+
+ /// <summary>
+ /// 鏁村崟姣涢噸
+ /// </summary>
+ [SugarColumn(ColumnName = "gross_weight")]
+ public string GrossWeight { get; set; }
+
+ /// <summary>
+ /// 鏁村崟鍑�閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "net_weight")]
+ public string NetWeight { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺鍗曚綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "unit_weight_code")]
+ public string UnitWeightCode { get; set; }
+
+ /// <summary>
+ /// 閲嶉噺鍗曚綅鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "unit_weight_name")]
+ public string UnitWeightName { get; set; }
+
+ /// <summary>
+ /// 鍖呰鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "packing_qty")]
+ public string PackingQty { get; set; }
+
+ /// <summary>
+ /// 鍝佺墝鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "brand_name")]
+ public string BrandName { get; set; }
+
+ /// <summary>
+ /// 鍏朵粬鎵╁睍瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "other_extend")]
+ public string OtherExtend { get; set; }
+
+ /// <summary>
+ /// 鍘熶骇鍥界紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "original_country_code")]
+ public string OriginalCountryCode { get; set; }
+
+ /// <summary>
+ /// 鍘熶骇鍥藉悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "original_country_name")]
+ public string OriginalCountryName { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "remark")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n01")]
+ public string ExtendN01 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n02")]
+ public string ExtendN02 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n03")]
+ public string ExtendN03 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁4
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n04")]
+ public string ExtendN04 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁5
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n05")]
+ public string ExtendN05 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁6
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n06")]
+ public string ExtendN06 { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍦扮偣缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "store_code")]
+ public string StoreCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍦扮偣鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "store_name")]
+ public string StoreName { get; set; }
+
+ /// <summary>
+ /// 宸茬鏀舵暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "verify_qty")]
+ public string VerifyQty { get; set; }
+
+ /// <summary>
+ /// 鍙叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "allow_qty")]
+ public string AllowQty { get; set; }
+
+ /// <summary>
+ /// 璁╂鎺ユ敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "compromise_qty")]
+ public string CompromiseQty { get; set; }
+
+ /// <summary>
+ /// 鎷掓敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "refused_qty")]
+ public string RefusedQty { get; set; }
+
+ /// <summary>
+ /// 閫�璐у崟ERP缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "rto_erp_no")]
+ public string RtoErpNo { get; set; }
+
+ /// <summary>
+ /// 閫�璐у崟椤规
+ /// </summary>
+ [SugarColumn(ColumnName = "rto_line_no")]
+ public string RtoLineNo { get; set; }
+
+ /// <summary>
+ /// 浜у搧闀垮害
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_length")]
+ public string ProdLength { get; set; }
+
+ /// <summary>
+ /// 浜у搧瀹藉害
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_width")]
+ public string ProdWidth { get; set; }
+
+ /// <summary>
+ /// 浜у搧楂樺害
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_height")]
+ public string ProdHeight { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍛樺鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "buyer_name")]
+ public string BuyerName { get; set; }
+
+ /// <summary>
+ /// 棰勮浜ゆ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "expected_date")]
+ public string ExpectedDate { get; set; }
+
+ /// <summary>
+ /// 鍥炲浜ゆ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "answer_date")]
+ public string AnswerDate { get; set; }
+
+ /// <summary>
+ /// 甯佺缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "currency_code")]
+ public string CurrencyCode { get; set; }
+
+ /// <summary>
+ /// 甯佺鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "currency_name")]
+ public string CurrencyName { get; set; }
+
+ /// <summary>
+ /// 鍙戦�佺鏀剁姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "send_verify_status")]
+ public string SendVerifyStatus { get; set; }
+
+ /// <summary>
+ /// 缁撴灉鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "result_flag")]
+ public string ResultFlag { get; set; }
+
+ /// <summary>
+ /// 鐢宠鍑鸿揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "apply_delivery_qty")]
+ public string ApplyDeliveryQty { get; set; }
+
+ /// <summary>
+ /// 鐢宠鍑鸿揣璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "apply_delivery_valuation_qty")]
+ public string ApplyDeliveryValuationQty { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "batch_number")]
+ public string BatchNumber { get; set; }
+
+ /// <summary>
+ /// 宸叉敹璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "receive_qty")]
+ public string ReceiveQty { get; set; }
+
+ /// <summary>
+ /// 宸插叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "storage_qty")]
+ public string StorageQty { get; set; }
+
+ /// <summary>
+ /// 閫�璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "return_qty")]
+ public string ReturnQty { get; set; }
+
+ /// <summary>
+ /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
+ /// </summary>
+ [SugarColumn(ColumnName = "first_check")]
+ public string FirstCheck { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曢」娆℃樉绀虹敤
+ /// </summary>
+ [SugarColumn(ColumnName = "po_line_no_show")]
+ public string PoLineNoShow { get; set; }
+
+ /// <summary>
+ /// 澶氳瑷�澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "remarks")]
+ public string Remarks { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "create_time")]
+ public string CreateTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "update_time")]
+ public string UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍏宠仈涓昏〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "pid")]
+ public string Pid { get; set; }
+
+ /// <summary>
+ /// 鎺掔▼椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_line_no")]
+ public string PlanLineNo { get; set; }
+}
\ No newline at end of file
diff --git a/entity/TblBarcodeInformation.cs b/entity/TblBarcodeInformation.cs
new file mode 100644
index 0000000..a9c8b72
--- /dev/null
+++ b/entity/TblBarcodeInformation.cs
@@ -0,0 +1,179 @@
+锘縰sing SqlSugar;
+using System;
+
+namespace MES.Service.Models;
+
+/// <summary>
+/// 鎼哄浜戞潯鐮佷俊鎭〃
+/// </summary>
+[SugarTable("TBL_BARCODE_INFORMATION")]
+public class TblBarcodeInformation
+{
+ /// <summary>
+ /// 涓婚敭Guid锛圫EQ_XKY锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public string Id { get; set; }
+
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "product_code")]
+ public string ProductCode { get; set; }
+
+ /// <summary>
+ /// 灏忓寘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "small_barcode")]
+ public string SmallBarcode { get; set; }
+
+ /// <summary>
+ /// 澶у寘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "big_barcode")]
+ public string BigBarcode { get; set; }
+
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_barcode")]
+ public string OuterBarcode { get; set; }
+
+ /// <summary>
+ /// 褰撳墠灏忓寘鏉＄爜鍖呭惈鐨勬暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "include_qty")]
+ public string IncludeQty { get; set; }
+
+ /// <summary>
+ /// 灏忓寘鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_length")]
+ public string SmallPackageLength { get; set; }
+
+ /// <summary>
+ /// 灏忓寘鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_width")]
+ public string SmallPackageWidth { get; set; }
+
+ /// <summary>
+ /// 灏忓寘鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_height")]
+ public string SmallPackageHeight { get; set; }
+
+ /// <summary>
+ /// 澶у寘鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_length")]
+ public string BigPackageLength { get; set; }
+
+ /// <summary>
+ /// 澶у寘鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_width")]
+ public string BigPackageWidth { get; set; }
+
+ /// <summary>
+ /// 澶у寘鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_height")]
+ public string BigPackageHeight { get; set; }
+
+ /// <summary>
+ /// 澶栫鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_length")]
+ public string OuterPackageLength { get; set; }
+
+ /// <summary>
+ /// 澶栫鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_width")]
+ public string OuterPackageWidth { get; set; }
+
+ /// <summary>
+ /// 澶栫鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_height")]
+ public string OuterPackageHeight { get; set; }
+
+ /// <summary>
+ /// 褰撳墠灏忓寘鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_sn")]
+ public string SmallPackageSn { get; set; }
+
+ /// <summary>
+ /// 褰撳墠澶у寘鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_sn")]
+ public string BigPackageSn { get; set; }
+
+ /// <summary>
+ /// 褰撳墠澶栫鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "out_package_sn")]
+ public string OutPackageSn { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "dynamic_data")]
+ public string DynamicData { get; set; }
+
+ /// <summary>
+ /// 鍖呰灞傜骇
+ /// </summary>
+ [SugarColumn(ColumnName = "pack_level")]
+ public string PackLevel { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime CreateTime { get; set; } = DateTime.Now;
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime UpdateTime { get; set; } = DateTime.Now;
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_no")]
+ public string DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "po_erp_no")]
+ public string PoErpNo { get; set; }
+
+ /// <summary>
+ /// 椤圭洰(鍗曡韩extendN01)
+ /// </summary>
+ [SugarColumn(ColumnName = "extend_n01")]
+ public string ExtendN01 { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟椤规(ERP)
+ /// </summary>
+ [SugarColumn(ColumnName = "po_line_no")]
+ public string PoLineNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "inner_vendor_code")]
+ public string InnerVendorCode { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡锛堣嚜瀹氫箟瀛楁customize1锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "customize1")]
+ public string Customize1 { get; set; }
+}
\ No newline at end of file
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 90891f4..60c3601 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -1,4 +1,4 @@
-锘�// OaApiService.cs
+// OaApiService.cs
using System;
using System.Collections.Generic;
using System.Dynamic;
diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs
index ae09d2c..c09c8d7 100644
--- a/service/Warehouse/MesXkyService.cs
+++ b/service/Warehouse/MesXkyService.cs
@@ -5,6 +5,7 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.util;
using Newtonsoft.Json;
using SqlSugar;
@@ -15,25 +16,29 @@
using System.Security.Cryptography;
using System.Text;
using static Azure.Core.HttpHeader;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using static NewPdaSqlServer.Controllers.Warehouse.MesXkyController;
namespace NewPdaSqlServer.service.QC;
public class MesXkyService : RepositoryNoEntity
{
- public bool XKY_GET_DHD(dynamic entity)
+ public dynamic XKY_GET_DHD(XKYGetDhdRequest entity)
{
- string ErrorMsg = "";
- ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
try
{
- string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}";
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
+
+ //string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}";
+ string sendJson = JsonConvert.SerializeObject(entity);
ArrayList SQLStringList = new ArrayList();
// var client = new HttpClient();
var url = "https://openapi.xiekeyun.com/delivery/getNoList.json";
HttpClient httpClient = new HttpClient();
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- string json = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + data_inserted + "}";
+ string json = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
byte[] postData = Encoding.UTF8.GetBytes(json);
// 鍒涘缓璇锋眰瀵硅薄
@@ -56,20 +61,34 @@
string result2 = reader.ReadToEnd();
responseJson = JsonConvert.DeserializeObject(result2);
-
}
+
+ if (responseJson.result != 1)
+ throw new ApplicationException(responseJson.errorMsg);
+
+ var result = 0;
+ // 鏂板鏁版嵁瀛樺偍閫昏緫
+ List<DeliveryNotice> noticeList = JsonConvert.DeserializeObject<List<DeliveryNotice>>(responseJson.dataList.ToString());
+ noticeList.ForEach(n => n.Id = Guid.NewGuid()); // 鏂板GUID璧嬪��
+ Db.Ado.UseTran(() =>
+ {
+ result = Db.Insertable(noticeList).ExecuteCommand();
+ }, ex =>
+ {
+ throw new Exception($"鏁版嵁搴撴彃鍏ュけ璐ワ細{ex.Message}\n{ex.InnerException?.Message}");
+ });
+
+ return responseJson;
}
- catch (Exception ex)
+ catch (Exception e)
{
- ErrorMsg = ex.Message;
- return false;
+ throw new Exception(e.Message);
}
- return true;
}
- public dynamic GetXkyDHD(dynamic entity)
+ public dynamic GetXkyDHD(XKYGetDhdRequest entity)
{
return XKY_GET_DHD(entity);
--
Gitblit v1.9.3