fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -39,7 +39,9 @@ */ @DataProvider public Map<String, Object> getYearQuery(Map<String, Object> param) { Map<String, Object> result = new HashMap<String, Object>(); if(null == param) param = new HashMap<>(); Map<String, Object> result = new HashMap<>(); //获取参数中分库编码 String deptId = (String)param.get("deptId");
@@ -6,12 +6,10 @@ <DataType name="dtMain" parent="dtNoticeIn"/> </Model> <View layout="padding:10"> <ClientEvent name="onReady">var deptId = window.parent.deptId;//父页面中的分库编码
 var TYPE = "NOTICE_IN";
 query = function(){
 view.get("#dsQuery").set("parameter",{deptId:deptId}).flushAsync();
 <ClientEvent name="onReady">query = function(){
 var param = view.get("#dsQuery.data");
 view.get("#dsMain").set("parameter",param).flushAsync();
 };
 query();
 
 
 //宣传操作
 @@ -39,11 +37,17 @@ 
 //点击审核
 audit = function(){
 
 var cur = view.get("#dsMain.data:#");
 var url ="com.fzzy.work.WorkOrder.d?businessId="+cur.get("id");
 $openTab("工单管理",url);
 }
 //点击详细
 showDetail = function(){
 
 view.get("#dialogMain").show();
 }
 //点击打印
 print = function(){
 $alert("未获取到打印模板……");
 }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> @@ -54,13 +58,12 @@ </DataSet> <DataSet id="dsQuery"> <Property name="dataProvider">inoutNoticePR#getYearQuery</Property> <Property name="loadMode">manual</Property> <Property name="dataType">dtNoticeParam</Property> </DataSet> <Container> <Property name="className">c-param</Property> <AutoForm> <Property name="cols">*,*,*,90,90,*</Property> <Property name="cols">*,*,*,90,90,90</Property> <Property name="dataSet">dsQuery</Property> <Property name="labelAlign">right</Property> <Property name="labelWidth">100</Property> @@ -100,13 +103,6 @@ </Container> <Container> <Property name="className">c-data</Property> <ToolBar> <ToolBarButton layoutConstraint="left"> <Property name="caption">导出EXCEL</Property> <Property name="exClassName">btn4</Property> <Property name="iconClass">fa fa-file-excel-o</Property> </ToolBarButton> </ToolBar> <DataGrid id="dataGridMain" layoutConstraint="padding:8"> <ClientEvent name="onDataRowClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent> <Property name="dataSet">dsMain</Property> @@ -176,27 +172,24 @@ <Property name="width">1200</Property> <Property name="iconClass">fa fa-tasks</Property> <Buttons> <Button id="btnOk"> <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
 if(result){
 $alert(result);
 return;
 }
 $notify("数据执行完成！！");
 self.get("parent").hide();
 });</ClientEvent> <Property name="caption">保存</Property> <Button> <ClientEvent name="onClick">autid();</ClientEvent> <Property name="caption">审批</Property> <Property name="iconClass">fa fa-check-circle</Property> <Property name="exClassName">btn1</Property> <Property name="width">120</Property> </Button> <Button> <ClientEvent name="onClick">print();</ClientEvent> <Property name="caption">打印</Property> <Property name="iconClass">fa fa-file-word-o</Property> <Property name="exClassName">btn2</Property> </Button> <Button> <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
 self.get("parent").hide();</ClientEvent> <Property name="caption">取消</Property> <Property name="caption">关闭</Property> <Property name="exClassName">btn3</Property> <Property name="iconClass">fa fa-times-circle</Property> <Property name="width">120</Property> </Button> </Buttons> <Children> @@ -231,6 +224,7 @@ <Property name="labelAlign">right</Property> <Property name="labelSeparator">：</Property> <Property name="labelWidth">120</Property> <Property name="readOnly">true</Property> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">name</Property> <Property name="property">name</Property> fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
@@ -6,12 +6,10 @@ <DataType name="dtMain" parent="dtNoticeOut"/> </Model> <View layout="padding:10"> <ClientEvent name="onReady">var deptId = window.parent.deptId;//父页面中的分库编码
 var TYPE = "NOTICE_OUT";
 query = function(){
 view.get("#dsQuery").set("parameter",{deptId:deptId}).flushAsync();
 <ClientEvent name="onReady">query = function(){
 var param = view.get("#dsQuery.data");
 view.get("#dsMain").set("parameter",param).flushAsync();
 };
 query();
 
 
 //宣传操作
 @@ -39,11 +37,17 @@ 
 //点击审核
 audit = function(){
 
 var cur = view.get("#dsMain.data:#");
 var url ="com.fzzy.work.WorkOrder.d?businessId="+cur.get("id");
 $openTab("工单管理",url);
 }
 //点击详细
 showDetail = function(){
 
 view.get("#dialogMain").show();
 }
 //点击打印
 print = function(){
 $alert("未获取到打印模板……");
 }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> @@ -55,12 +59,11 @@ <DataSet id="dsQuery"> <Property name="dataType">dtNoticeParam</Property> <Property name="dataProvider">inoutNoticePR#getYearQuery</Property> <Property name="loadMode">manual</Property> </DataSet> <Container> <Property name="className">c-param</Property> <AutoForm> <Property name="cols">*,*,*,90,90,*</Property> <Property name="cols">*,*,*,90,90,50</Property> <Property name="dataSet">dsQuery</Property> <Property name="labelAlign">right</Property> <Property name="labelWidth">100</Property> @@ -91,7 +94,7 @@ <Property name="exClassName">btn-q1</Property> </Button> <Button> <ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent> <ClientEvent name="onClick">query();</ClientEvent> <Property name="caption">重置</Property> <Property name="exClassName">btn-q2</Property> <Property name="iconClass">fa fa-refresh</Property> @@ -101,6 +104,7 @@ <Container> <Property name="className">c-data</Property> <ToolBar> <Property name="ignored">true</Property> <ToolBarButton layoutConstraint="left"> <Property name="caption">导出EXCEL</Property> <Property name="exClassName">btn4</Property> @@ -176,27 +180,24 @@ <Property name="width">1200</Property> <Property name="iconClass">fa fa-tasks</Property> <Buttons> <Button id="btnOk"> <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
 if(result){
 $alert(result);
 return;
 }
 $notify("数据执行完成！！");
 self.get("parent").hide();
 });</ClientEvent> <Property name="caption">保存</Property> <Button> <ClientEvent name="onClick">autid();</ClientEvent> <Property name="caption">审批</Property> <Property name="iconClass">fa fa-check-circle</Property> <Property name="exClassName">btn1</Property> <Property name="width">120</Property> </Button> <Button> <ClientEvent name="onClick">print();</ClientEvent> <Property name="caption">打印</Property> <Property name="iconClass">fa fa-file-word-o</Property> <Property name="exClassName">btn2</Property> </Button> <Button> <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
 self.get("parent").hide();</ClientEvent> <Property name="caption">取消</Property> <Property name="caption">关闭</Property> <Property name="exClassName">btn3</Property> <Property name="iconClass">fa fa-times-circle</Property> <Property name="width">120</Property> </Button> </Buttons> <Children> @@ -231,6 +232,7 @@ <Property name="labelAlign">right</Property> <Property name="labelSeparator">：</Property> <Property name="labelWidth">120</Property> <Property name="readOnly">true</Property> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">name</Property> <Property name="property">name</Property> fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -67,10 +67,10 @@ <Property name="label">备注说明</Property> </PropertyDef> <PropertyDef name="companyId"> <Property/> <Property></Property> </PropertyDef> <PropertyDef name="deptId"> <Property/> <Property></Property> <Property name="label">所属库区</Property> </PropertyDef> </DataType> @@ -170,8 +170,138 @@ <ClientEvent name="onReady">self.insert({});</ClientEvent> <Property name="dataType">dtParam</Property> </DataSet> <HtmlContainer layoutConstraint="top "> <Property name="content"><style>
 .parent {
 display: flex;
 width: 100%;
 background: #FFF;
 }
 .console-link-block {
 font-size: 16px;
 padding: 20px 20px;
 border-radius: 4px;
 background-color: #40D4B0;
 color: #FFFFFF !important;
 box-shadow: 0 2px 3px rgba(0, 0, 0, .05);
 position: relative;
 overflow: hidden;
 display: block;
 }
 
 .console-link-block .console-link-block-num {
 font-size: 40px;
 margin-bottom: 5px;
 opacity: .9;
 }
 
 .console-link-block .console-link-block-text {
 opacity: .8;
 }
 .console-link-block .console-link-block-icon {
 position: absolute;
 top: 50%;
 right: 20px;
 width: 50px;
 height: 50px;
 font-size: 50px;
 line-height: 50px;
 margin-top: -25px;
 color: #FFFFFF;
 opacity: .8;
 }
 .console-link-block .console-link-block-band {
 color: #fff;
 width: 100px;
 font-size: 12px;
 padding: 2px 0 3px 0;
 background-color: #E32A16;
 line-height: inherit;
 text-align: center;
 position: absolute;
 top: 8px;
 right: -30px;
 transform-origin: center;
 transform: rotate(45deg) scale(.8);
 opacity: .95;
 z-index: 2;
 }
 .bg2{
 background-color: #55A5EA;
 }
 .bg3{
 background-color: #9DAFFF;
 }
 .bg4{
 background-color: #F591A2;
 }
 .bg5{
 background-color: #FEAA4F;
 }
 .child {
 flex: 1;
 padding: 10px;
 box-sizing: border-box;
 }
 .child:last-child {
 border-right: none;
 }
 .console-icon{
 height:50px;
 position:absolute;
 right:20px;
 opacity:.8;
 top:50%;
 margin-top:-25px;
 }
 
 </style>
 
 <!-- 快捷方式 -->
 <div class="parent">
 
 <div class="child">
 <div class="console-link-block">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">今日工单统计</div>
 <img class="console-icon" src="/img/icon-wj.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg2">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">今日待完成工单</div>
 <img class="console-icon" src="/img/icon-wj2.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg3">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">总工单统计</div>
 <img class="console-icon" src="/img/icon-tj.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg4">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">总未完成工单</div>
 <img class="console-icon" src="/img/icon-tj2.png">
 </div>
 </div>
 
 </div></Property> <Property name="style"> <Property name="background-color">#FFF</Property> </Property> </HtmlContainer> <Container> <Property name="className">c-param</Property> <Property name="style"> <Property name="margin-top">10px</Property> </Property> <AutoForm> <Property name="cols">*,*,*,*,90,90</Property> <Property name="dataSet">dsQuery</Property> fzzy-igdss-web/src/main/java/com/fzzy/Application.java
@@ -26,7 +26,7 @@ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @ComponentScan(basePackages = {"com.fzzy", "com.ruoyi", "com.ld"}) @MapperScan("com.fzzy.igds.mapper") @MapperScan("com.fzzy.*.mapper") @EntityScan(basePackages = {"com.fzzy.*.*.domain"}) public class Application {
@@ -3,8 +3,8 @@ import com.fzzy.igds.constant.Constant; import com.fzzy.igds.constant.DepotType; import com.fzzy.igds.data.IgdsBaseParam; import com.fzzy.igds.data.MainData; import com.fzzy.igds.data.InoutParam; import com.fzzy.igds.data.MainData; import com.fzzy.igds.domain.*; import com.fzzy.igds.service.*; import com.fzzy.igds.utils.ContextUtil; @@ -18,11 +18,12 @@ import com.ruoyi.system.service.ISysDeptService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.*; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; /** * @Description @@ -39,7 +40,7 @@ private DicService dicService; @Resource private CoreDeptService coreDeptService; @Autowired @Resource private SecCameraService secCameraService; @Resource private ISysDeptService iSysDeptService; @@ -112,14 +113,14 @@ * @return */ public List<Depot> listDepotByDeptId(String deptId) { try{ try { if (StringUtils.isEmpty(deptId)) { deptId = ContextUtil.subDeptId(null); } return depotService.getCacheDepotList(ContextUtil.getCompanyId(), deptId); }catch (Exception e){ } catch (Exception e) { return null; } } @@ -221,7 +222,7 @@ for (int i = -29; i <= 0; i++) { mapMonthInNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0); mapMonthOutNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0); if(i >=-6){ if (i >= -6) { mapWeekInNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0); mapWeekOutNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0); mapWeekAiNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0); @@ -238,8 +239,8 @@ if (null != listEvent && !listEvent.isEmpty()) { mainData.setAiNum(listEvent.size()); for (EventInfo event : listEvent) { key = DateFormatUtils.format(event.getTime(),"MM-dd"); if(null != mapWeekAiNum.get(key)){ key = DateFormatUtils.format(event.getTime(), "MM-dd"); if (null != mapWeekAiNum.get(key)) { mapWeekAiNum.put(key, mapWeekAiNum.get(key) + 1); } } @@ -253,8 +254,8 @@ List<SnapRecord> listSnap = snapRecordService.getListByParam(param); if (null != listSnap && !listSnap.isEmpty()) { for (SnapRecord snap : listSnap) { key = DateFormatUtils.format(snap.getSnapTime(),"MM-dd"); if(null != mapWeekSnapNum.get(key)){ key = DateFormatUtils.format(snap.getSnapTime(), "MM-dd"); if (null != mapWeekSnapNum.get(key)) { mapWeekSnapNum.put(key, mapWeekSnapNum.get(key) + 1); } } @@ -272,27 +273,27 @@ List<InoutRecord> inoutRecords = inoutRecordService.listInout(inoutParam); if (null != inoutRecords && !inoutRecords.isEmpty()) { for (InoutRecord record : inoutRecords) { key = DateFormatUtils.format(record.getRegisterTime(),"MM-dd"); if(Constant.TYPE_IN.equals(record.getType())){ if(null != mapWeekInNum.get(key)){ key = DateFormatUtils.format(record.getRegisterTime(), "MM-dd"); if (Constant.TYPE_IN.equals(record.getType())) { if (null != mapWeekInNum.get(key)) { mapWeekInNum.put(key, mapWeekInNum.get(key) + 1); } if(null != mapMonthInNum.get(key)){ if (null != mapMonthInNum.get(key)) { mapMonthInNum.put(key, mapMonthInNum.get(key) + 1); } if(key.equals(DateFormatUtils.format(new Date(),"MM-dd"))){ if (key.equals(DateFormatUtils.format(new Date(), "MM-dd"))) { mainData.setInNumDay(mainData.getInNumDay() + 1); inSum += record.getRecordWeight(); } } if(Constant.TYPE_OUT.equals(record.getType())){ if(null != mapWeekOutNum.get(key)){ if (Constant.TYPE_OUT.equals(record.getType())) { if (null != mapWeekOutNum.get(key)) { mapWeekOutNum.put(key, mapWeekOutNum.get(key) + 1); } if(null != mapMonthOutNum.get(key)){ if (null != mapMonthOutNum.get(key)) { mapMonthOutNum.put(key, mapMonthOutNum.get(key) + 1); } if(key.equals(DateFormatUtils.format(new Date(),"MM-dd"))){ if (key.equals(DateFormatUtils.format(new Date(), "MM-dd"))) { mainData.setOutNumDay(mainData.getOutNumDay() + 1); outSum += record.getRecordWeight(); } fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/DemoController.java
@@ -1,7 +1,6 @@ package com.fzzy.sys.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam;
@@ -90,7 +90,6 @@ .d-grid .data-table .row td { border-bottom: 1px solid #e7eaec !important; background-color: transparent; border: 0px; } /** 调整DataGrid和AutoForm的编辑框高度 **/ fzzy-igdss-web/src/main/resources/d7/common.js
@@ -15,4 +15,5 @@ window.$openTab = function (name,url) { var panelId = window.frameElement.getAttribute('data-id'); window.parent.$.modal.openTab(name, url, false, panelId); //window.parent.$.modal.parentTab(name,url); }; fzzy-igdss-web/src/main/resources/static/img/icon-tj.png
