xuli
/
JinHaoPanel
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

进度看板调整

master
fyw 2 years ago
parent
a5e04364d0
commit
2a4a0b5f8e
3 changed files with 12 additions and 396 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      NFine.Application/SRM/WatchPanelApp.cs
  2. 2
      NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml
  3. 392
      NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa3.cshtml

14
NFine.Application/SRM/WatchPanelApp.cs
View File

@ -1254,9 +1254,9 @@ ORDER BY 销售车号,物料编码,报工人
) wipb on tmo.socode = wipb.socode
select row_number() over (order by a.客户交货期,a.销售车辆号)as 序号, a.* from (
select distinct tso.socode 销售车辆号,tso.plandate as 客户交货期, isnull(convert(char(4),cus.fname),'') 用户单位,
select distinct tso.socode 销售车辆号,convert(varchar(10),tso.plandate,120) as 客户交货期, isnull(convert(char(4),cus.fname),'') 用户单位,
inv.invname as 产品名称,
concat(cast(cast(tnum.wipnum * 1.0 / tnum.monum as decimal(18,3))* 100 as decimal(18,1)),'%') 进度,
concat(cast(cast(tnum.wipnum * 1.0 / tnum.monum as decimal(18,3))* 100 as decimal(18,0)),'%') 进度,
(case when tnum.wipnum/tnum.monum =1 then '已完工' when tnum.wipbnum >0 then '开工中' else '未开工' end ) 生产状态
from
icsso tso
@ -1279,9 +1279,7 @@ ORDER BY 销售车号,物料编码,报工人
#region 振翔看板产量
public DataTable GetOutput()
{
string SqlText = "";
SqlText = @" if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempNum'))
drop table #tempNum
if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempData'))
@ -1310,14 +1308,14 @@ ORDER BY 销售车号,物料编码,报工人
where moth = CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) )a --此部分为上月数据
left join (
select isnull(mpproduct,0) as 前月度生产 from ICSZXBoardPlan
where moth = CONVERT(CHAR(10),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) ) b on 1=1 --此部分为前月数据
where moth = CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) ) b on 1=1 --此部分为前月数据
left join (
select count(*) 上月完成 from #tempNum t where t.wipnum = t.monum and t.EndTime between
CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
and CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)) c on 1=1
left join (
select count(*) 前月完成 from #tempNum t where t.wipnum = t.monum and t.EndTime between
CONVERT(CHAR(10),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
and CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)) d on 1=1
left join (
select count(*) 年度生产 from #tempNum t where t.wipnum = t.monum and t.EndTime >=
@ -1334,7 +1332,7 @@ ORDER BY 销售车号,物料编码,报工人
case when isnull(前月完成,0) = 0 then 0 else
convert(decimal(10,2),isnull(前月完成,0))*1.0/isnull(convert(decimal(10,2),case when 前月度生产 = 0 then 1 else 前月度生产 end),1) end 前月比,
month(DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE()))) 上月,
month(DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE()))) 前月
month(DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE()))) 前月
from #tempData
if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempNum'))
drop table #tempNum
@ -1460,7 +1458,7 @@ ORDER BY 销售车号,物料编码,报工人
where t.wipnum = t.monum and t.EndTime between
CONVERT(CHAR(10),DATEADD(month,-6,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
and CONVERT(CHAR(10),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
order by Mont
if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempNum'))
drop table #tempNum
";

2
NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml
View File

@ -849,7 +849,7 @@ background-color:#6495ED;">
var value6 = 0;
var value7 = 0;
for (var i = 0; i < data.length; i++) {
value = data[i].上月度生产;
value = data[i].上月度生产;//前月改本月
value1 = data[i].上月完成;
value2 = data[i].前月度生产;
value3 = data[i].前月完成;

392
NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa3.cshtml
View File

@ -160,7 +160,7 @@
.TopNameTime {
vertical-align: middle;
text-align: right;
font-size: 10px;
font-size: 20px;
font-weight: 700;
color: white;
}
@ -336,7 +336,7 @@
<ul class="ul_title">
<li>序号</li>
<li>生产编号</li>
<li>产品名称</li>
<li >产品名称</li>
<li>用户单位</li>
<li>客户交货期</li>
<li>生产状态</li>
@ -446,204 +446,7 @@
}
}
}
//function echart1_1() {
// // 基于准备好的dom，初始化echarts实例
// var myChart = echarts.init(document.getElementById('echart1_1'));
// var MonthArray = new Array();
// var MonthPercent = new Array();
// var MonthPercent_BZ = new Array();
// $.ajax({
// url: "/SRM/WatchPanel/GetZhiXing_OQC?XX=XX&" + Math.random(),
// dataType: "json",
// async: false,
// success: function (data) {
// if (data != false && data != null && data.length > 0) {
// for (var i = 0; i < data.length; i++) {
// MonthArray.push(data[i].月份);
// MonthPercent.push(data[i].PercentNum);
// MonthPercent_BZ.push(99.5);
// }
// //MonthPercent = [80, 75.23, 98, 40, 60,53];//测试
// var colors = ['#9c90e7', '#4ff494', '#f2c290', '#FFD700', '#f3aaf5', '#fcfb68']
// var colors2 = ['#6A5ACD', '#3D9140', '#ED9121', '#DAA569', '#A066D3', '#E3CF57'];
// option = {
// color: colors,
// tooltip: {
// trigger: 'axis',
// axisPointer: { type: 'shadow' },
// formatter: function (params) {
// var showHtm = "";
// showHtm = params[0].name + "月:" + '<br>' +
// params[0].seriesName + ':' + params[0].data + "%" + '<br>' +
// params[2].seriesName + ':' + params[2].data + "%";
// return showHtm;
// }
// },
// grid: {
// "top": "15",
// "right": "20",
// "bottom": "20",
// "left": "40",
// },
// legend: {
// show: false,
// },
// "xAxis": [
// {
// data: MonthArray,
// axisLine: { show: true, lineStyle: { color: "rgba(255,255,255,.9)", } },
// axisTick: { show: true, },
// axisLabel: {
// textStyle: {
// show: true,
// //fontSize: 9,
// color: "rgba(255,255,255,.9)",
// },
// },
// },
// ],
// "yAxis": [
// {
// max: 100,
// "type": "value",
// axisTick: {
// show: true,
// lineStyle: {
// show: true,
// color: "rgba(255,255,255,.9)",
// },
// },
// splitLine: { show: false, },
// axisLine: {
// show: true,
// lineStyle: {
// show: true,
// //fontSize: 9,
// color: "rgba(255,255,255,.9)",
// },
// },
// axisLabel: {
// show: true,
// color: "rgba(255,255,255,.9)"
// },
// axisLine: {
// show: true,
// lineStyle: {
// show: true,
// color: "rgba(255,255,255,.9)",
// },
// },
// }
// ],
// "series": [
// {
// "name": "合格率",
// "type": "bar",
// "data": MonthPercent,
// barWidth: _BarWidth,
// "itemStyle": {
// "normal": {
// barBorderRadius: _barBorderRadius_M,
// //color: function (params)
// //{
// // return colors[params.dataIndex];
// //},
// color: function (params) {
// return new echarts.graphic.LinearGradient(
// 0,
// 0,
// 0,
// 1,
// [
// { offset: 0, color: colors[params.dataIndex] },
// { offset: 1, color: colors2[params.dataIndex] }
// ]
// )
// },
// barBorderRadius: [3, 3, 3, 3],
// }
// },
// animation: false,
// barGap: '-100%',
// barCategoryGap: '40%',
// label: {
// show: true,
// formatter: '{c}%',
// },
// }
// ,
// {
// "name": "合格率",
// "type": "line",
// "data": MonthPercent,
// barWidth: _BarWidth,
// "itemStyle": {
// "normal": {
// color: "#96aef1",
// }
// },
// label: {
// show: false,
// //position: 'outside',
// formatter: '{c}%',
// },
// }
// ,
// {
// "name": "标准值",
// "type": "line",
// "data": MonthPercent_BZ,
// "itemStyle": {
// "normal": {
// }
// },
// label: {
// show: false,
// //position: 'outside',
// formatter: '{c}%',
// }
// },
// ]
// };
// myChart.setOption(option);
// }
// else {
// return null;
// }
// },
// error: function (aa) {
// return null;
// }
// });
//}
//区域一
function GetArea1() {
@ -667,192 +470,7 @@
}
});
}
function GetArea3() {
// 基于准备好的dom，初始化echarts实例
//var MonthArray = new Array();
//var MonthPercent = new Array();
//var MonthPercent_BZ = new Array();
$.ajax({
url: "/SRM/WatchPanel/GetOutput?XX=XX&" + Math.random(),
dataType: "json",
async: false,
success: function (data) {
console.log(data);
if (data != false && data != null && data.length > 0) {
var value = 0;
var value1 = 0;
var value2 = 0;
var value3 = 0;
var value4 = 0;
var value5 = 0;
var value6 = 0;
var value7 = 0;
for (var i = 0; i < data.length; i++) {
value = data[i].上月度生产;
value1 = data[i].上月完成;
value2 = data[i].前月度生产;
value3 = data[i].前月完成;
value4 = data[i].上月比;
value5 = data[i].前月比;
value6 = data[0].前月;
value7 = data[0].上月;
}
$("#div3-C1-C1").html(value7 + "月完成率");
$("#div3-C2-C1").html(value6 + "月完成率");
$("#div3-C1-C2-div1").html(value3);
$("#lastMothPlan").html(value3);
$("#yearProduct").html(data[0].年度生产);
$("#div3-C1-C2-div2").html(value2);
$("#div3-C2-C2-div1").html(value1);
$("#div3-C2-C2-div2").html(value);
//MonthPercent = [80, 75.23, 98, 40, 60,53];//测试
var data = [value5, value5, value5];
var option3 = {
title: [
{
text: value7 + '月完成率',
x: '22%',
y: '90%',
textStyle: {
fontSize: 14,
fontWeight: '100',
color: '#5dc3ea',
lineHeight: 16,
textAlign: 'center',
},
},
{
text: value6 + '月完成率',
x: '76%',
y: '90%',
textStyle: {
fontSize: 14,
fontWeight: '100',
color: '#5dc3ea',
lineHeight: 16,
textAlign: 'center',
},
},
],
series: [
{
type: 'liquidFill',
radius: '85%',
center: ['30%', '48%'],
color: [
{
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: '#446bf5',
},
{
offset: 1,
color: '#0000FF',
},
],
globalCoord: false,
},
],
data: [value5, value5, value5], // data个数代表波浪数
backgroundStyle: {
borderWidth: 1,
color: 'RGBA(51, 66, 127, 0.7)',
},
label: {
normal: {
textStyle: {
fontSize: 14,
color: '#fff',
},
},
},
outline: {
// show: false
borderDistance: 0,
itemStyle: {
borderWidth: 6,
borderColor: '#0000FF',
},
},
},
{ //第二个球的填充
type: 'liquidFill',
radius: '85%',
center: ['84%', '45%'],
color: [
{
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: '#2aa1e3',
},
{
offset: 1,
color: '#08bbc9',
},
],
globalCoord: false,
},
],
data: [value4, value4, value4], // data个数代表波浪数
backgroundStyle: {
borderWidth: 1,
color: 'RGBA(51, 66, 127, 0.7)',
},
label: {
normal: {
textStyle: {
fontSize: 28,
color: '#fff',
},
},
},
outline: {
// show: false
borderDistance: 0,
itemStyle: {
borderWidth: 6,
borderColor: '#08bbc9',
},
},
},
],
};
myChartArea3.setOption(option3);
}
else {
return null;
}
},
error: function (aa) {
return null;
}
});
}
@ -868,7 +486,7 @@
for (var i = 0; i < data.length; i++) {
html += '<ul class="ul_con">';
html += '<li>' + data[i].序号 + '</li>';
html += '<li>' + data[i].销售车辆号 + '</li><li>' + data[i].产品名称 + '</li><li>' + data[i].用户单位 + '</li>';
html += '<li>' + data[i].销售车辆号 + '</li><li style="width: 9px; ">' + data[i].产品名称 + ' 2ssssssssssssssssssss222222222</li><li>' + data[i].用户单位 + '</li>';
html += '<li>' + data[i].客户交货期 + '</li><li>' + data[i].生产状态 + '</li>';
html += '<li>' + data[i].进度 + '</li></ul>';
}

Write Preview
Loading…
Cancel
Save