Controllers/QC/OAJyController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Controllers/Warehouse/MesXkyController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/DeliveryNotice.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/DeliveryNoticeDetail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/TblBarcodeInformation.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/QC/OaApi.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesXkyService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Controllers/QC/OAJyController.cs
@@ -1,4 +1,4 @@ using System.Dynamic; using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; 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 { entity/DeliveryNotice.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,275 @@ using 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; } } entity/DeliveryNoticeDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,436 @@ using SqlSugar; namespace MES.Service.Models; /// <summary> /// éè´§éç¥åæ®æç»è¡¨ /// </summary> [SugarTable("DELIVERY_NOTICE_DETAIL")] public class DeliveryNoticeDetail { /// <summary> /// 主é®Guidï¼SEQ_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> /// 忮夿³¨ï¼srcBillType=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; } } entity/TblBarcodeInformation.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,179 @@ using SqlSugar; using System; namespace MES.Service.Models; /// <summary> /// æºå®¢äºæ¡ç ä¿¡æ¯è¡¨ /// </summary> [SugarTable("TBL_BARCODE_INFORMATION")] public class TblBarcodeInformation { /// <summary> /// 主é®Guidï¼SEQ_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; } } service/QC/OaApi.cs
@@ -1,4 +1,4 @@ // OaApiService.cs // OaApiService.cs using System; using System.Collections.Generic; using System.Dynamic; 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);