From 78b0883ddf8329fa8693d78b01e1e0a7f5b6972e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 十二月 2023 13:10:02 +0800
Subject: [PATCH] 班次分组和横幅ID
---
zhengcaioa/IServices/IOrderBanciService.cs | 6 +
zhengcaioa/DTO/OrderBanciDTO.cs | 14 ++++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 44 ++++++++++++++
zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml | 40 +++++++++++++
zhengcaioa/Model/OrderBanci.cs | 3 +
zhengcaioa/Services/OrderBanciService.cs | 45 +++++++++++++++
zhengcaioa/Model/zhengcaioaContext.cs | 7 ++
7 files changed, 158 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/DTO/OrderBanciDTO.cs b/zhengcaioa/DTO/OrderBanciDTO.cs
index c436c8a..0555cb4 100644
--- a/zhengcaioa/DTO/OrderBanciDTO.cs
+++ b/zhengcaioa/DTO/OrderBanciDTO.cs
@@ -27,6 +27,9 @@
public int? Hang { get; set; }
public int? Lie { get; set; }
+ public string Fenzu { get; set; }
+ public int? BannerId { get; set; }
+
public string Shangxiawu { get; set; }
public string ShangxiawuName { get; set; }
@@ -76,4 +79,15 @@
public string ClassID { get; set; }
}
+
+
+ public class BanciFanhui
+ {
+
+
+ public string name { get; set; }
+
+ public string value { get; set; }
+
+ }
}
diff --git a/zhengcaioa/IServices/IOrderBanciService.cs b/zhengcaioa/IServices/IOrderBanciService.cs
index d84946c..70cd0fd 100644
--- a/zhengcaioa/IServices/IOrderBanciService.cs
+++ b/zhengcaioa/IServices/IOrderBanciService.cs
@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;
-
+using zhengcaioa.Models;
namespace IServices
{
@@ -28,5 +28,9 @@
List<OrderBanciZuoweiDTO> GetOrderBanciZuoweiList(string banciId);
+
+
+
+ List<OrderBanci> GetDangQianBanciList(string id);
}
}
diff --git a/zhengcaioa/Model/OrderBanci.cs b/zhengcaioa/Model/OrderBanci.cs
index 6d212c5..bbb3771 100644
--- a/zhengcaioa/Model/OrderBanci.cs
+++ b/zhengcaioa/Model/OrderBanci.cs
@@ -21,5 +21,8 @@
public int? Renshu { get; set; }
public int? Hang { get; set; }
public int? Lie { get; set; }
+ public string Fenzu { get; set; }
+ public int? BannerId { get; set; }
+
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 3327256..0a06c93 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -4840,6 +4840,13 @@
entity.Property(e => e.Lie)
.HasColumnName("lie");
+ entity.Property(e => e.Fenzu)
+ .HasColumnName("Fenzu");
+
+ entity.Property(e => e.BannerId)
+ .HasMaxLength(50)
+ .HasColumnName("BannerId");
+
entity.Property(e => e.Shijian)
.HasColumnType("datetime")
.HasColumnName("shijian");
diff --git a/zhengcaioa/Services/OrderBanciService.cs b/zhengcaioa/Services/OrderBanciService.cs
index c108375..241a18d 100644
--- a/zhengcaioa/Services/OrderBanciService.cs
+++ b/zhengcaioa/Services/OrderBanciService.cs
@@ -55,6 +55,9 @@
updateproject.Renshu = entity.Renshu;
updateproject.Hang = entity.Hang;
updateproject.Lie = entity.Lie;
+ updateproject.Fenzu = entity.Fenzu;
+ updateproject.BannerId = entity.BannerId;
+
}
if(entity.Hang.HasValue && entity.Lie.HasValue)
{
@@ -230,6 +233,10 @@
Lie = a.Lie ?? 0,
+ Fenzu = a.Fenzu,
+ BannerId = a.BannerId??0,
+
+
Creater = a.Creater,
Createtime = a.Createtime,
@@ -365,6 +372,9 @@
Hang = a.Hang ?? 0,
Lie = a.Lie ?? 0,
+ Fenzu = a.Fenzu,
+ BannerId = a.BannerId ?? 0,
+
Creater = a.Creater,
Createtime = a.Createtime,
@@ -451,5 +461,40 @@
return list;
}
+
+
+
+
+ public List<OrderBanci> GetDangQianBanciList(string id)
+ {
+
+
+
+
+ List<OrderBanci> list = new List<OrderBanci>();
+
+
+ try
+ {
+ var orderBanci = _context.OrderBancis.Find(id);
+ if (orderBanci != null)
+ {
+ list = _context.OrderBancis.Where(x => x.RecStatus == "A" && x.Fenzu == orderBanci.Fenzu).OrderBy(x => x.Shijian).ToList();
+ }
+
+ }
+ catch (Exception ex)
+ {
+
+
+ }
+
+
+
+
+
+
+ return list;
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
index 3161d05..1041000 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -710,5 +710,49 @@
}
return new JsonResult(returnMsg);
}
+
+
+
+ //鑾峰彇褰撳墠鐨勫煿璁�
+ public IActionResult GetDangQianBanciList(string id)
+ {
+ ReturnMsg<List<BanciFanhui>> returnMsg = new ReturnMsg<List<BanciFanhui>>();
+ returnMsg.code = 2;
+ try
+ {
+
+ List<OrderBanci> orderBanciDTOs = _orderBanciService.GetDangQianBanciList(id);
+ List<BanciFanhui> banciFanhuis = new List<BanciFanhui>();
+
+ if (orderBanciDTOs != null && orderBanciDTOs.Count > 0)
+ {
+ foreach (var orderBanciDTO in orderBanciDTOs)
+ {
+ BanciFanhui banciFanhui = new BanciFanhui();
+ banciFanhui.name = orderBanciDTO.Shijian.HasValue ? orderBanciDTO.Shijian.Value.ToString("yyyy-MM-dd") : "";
+ banciFanhui.value = orderBanciDTO.Id;
+ banciFanhuis.Add(banciFanhui);
+ }
+ }
+
+
+ returnMsg.code = 1;
+ returnMsg.count = orderBanciDTOs.Count;
+ returnMsg.returnObj = banciFanhuis;
+
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
index ee2ebab..04a9b05 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
@@ -213,6 +213,46 @@
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍒嗙粍</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="浜烘暟" name="Fenzu" id="Fenzu" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Fenzu" />
+
+
+
+ </div>
+
+
+
+ </div>
+
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">妯箙ID</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="浜烘暟" name="BannerId" id="BannerId" labtype="txt" addvisible="true" maxlength="10" editvisible="true" reg="" ismust="true" type="text" value="@Model.BannerId" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.replace(/[^\d]/g,'')">
+
+
+
+ </div>
+
+
+
+ </div>
+
+
+
+
+
+
--
Gitblit v1.9.1