Merge remote-tracking branch 'origin/master' into master

.classpath

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/target/

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>depot-web</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

README.md

@@ -1,4 +1,10 @@
+<<<<<<< HEAD
 ## depot-web-yunnan
 
 云南项目
 
+=======
+# depot-web-yunnan
+
+云南项目--初始化web前端
+>>>>>>> ad0adf2cee271cbf9f6d2aaba351644305c3b5bd

src/main/resources/application.properties

@@ -7,11 +7,11 @@ eureka.instance.lease-expiration-duration-in-seconds=30
 
 #数据库驱动
 spring.datasource.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url = jdbc:mysql://172.16.0.46:3306/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = 123456
 
-eureka.client.serviceUrl.defaultZone=http://localhost:9001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.0.46:9511/eureka/
 
 spring.application.name=depot-web
 
@@ -20,13 +20,13 @@ spring.application.name=depot-web
 #eureka.client.fetch-registry=false
 
 # Redis数据库索引（默认为0）
-spring.redis.database=0
+spring.redis.database=1
 # Redis服务器地址
-spring.redis.host=localhost
+spring.redis.host=172.16.0.46
 # Redis服务器连接端口
-spring.redis.port=6379
+spring.redis.port=6679
 # Redis服务器连接密码（默认为空）
-spring.redis.password=
+spring.redis.password=123456
 # 连接池最大连接数（使用负值表示没有限制）
 spring.redis.jedis.pool.max-active=8
 # 连接池最大阻塞等待时间（使用负值表示没有限制）

src/main/resources/static/app/agile/service/kcswService.js

@@ -178,4 +178,46 @@ angular.module('app.agile').service("kcswService", function($rootScope,$http, $q
         });
         return d.promise;
     };
+    this.getFoodStatistics = function(pageNum, pageSize, houseId, pz) {
+        var orgId = $rootScope.orgInfo.orgId;
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.agileUrl + '/agile/kcsw/getFoodStatistics',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : orgId,
+                houseId : houseId,
+                pz : pz
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+    this.getFoodExport = function(houseId, pz) {
+        var orgId = $rootScope.orgInfo.orgId;
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.agileUrl + '/agile/kcsw/getExport',
+            params : {
+                orgId : orgId,
+                houseId : houseId,
+                pz : pz
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

src/main/resources/static/app/home/controller/daibsxCtrl.js

@@ -1,20 +1,10 @@
 "use strict";
 angular.module('app.system')
-	.controller("daibsxCtrl", function($scope, $stateParams, $rootScope,$timeout, $uibModal, selectService, safeProduceNotifyService,fumigationPlanService, APP_CONFIG) {
+	.controller("daibsxCtrl", function($scope, $stateParams, $rootScope,$timeout, $uibModal, selectService, safeProduceNotifyService) {
 		// 获取代办事项数据
 		$scope.loadTodoData = function() {
-			 selectService.getloadTodoData().then(function(data) {
-			        $scope.TodoSize = data;
-			    },function(data){
-			        console.log(data);
-			    });
-
-			// 默认分页
-			$scope.pageInfo = {pageNum : 1, pageSize : 10};
-
-			// 加载列表
-			fumigationPlanService.getFumigationApproveList($scope.pageInfo, "", $rootScope.depotInfo.orgId, $rootScope.userInfo.userId, 1).then(function(data){
-				$scope.fumigationTotal = data.total;
+			selectService.getloadTodoData().then(function(data) {
+				$scope.TodoSize = data;
 			},function(data){
 				console.log(data);
 			});

src/main/resources/static/app/home/views/daibsx.html

@@ -5,7 +5,6 @@
         <div class="home-module-content">
             <ul class="list-group">
               <li class="list-group-item daib-li"><img alt="!" src="styles/img/home-1/icon1.png"/>&nbsp;<a href-void  ng-click="moreTodo()"><span style='color:white;'>智能粮库待办事项&nbsp;<span style='color:red;'>&nbsp;{{TodoSize==null?0:TodoSize}}</span>&nbsp;&nbsp;条</span></a><div class="daib-line"></div></li>
-              <li class="list-group-item daib-li"><img alt="!" src="styles/img/home-1/icon1.png"/>&nbsp;<a href-void  ng-click="moreTodo()"><span style='color:white;'>熏蒸作业待办事项&nbsp;<span style='color:red;'>&nbsp;{{fumigationTotal==null?0:fumigationTotal}}</span>&nbsp;&nbsp;条</span></a><div class="daib-line"></div></li>
               <li class="list-group-item daib-li"><img alt="!" src="styles/img/home-1/icon2.png"/>&nbsp;<a href-void  ng-click="safeProduceNotifyTodo()"><span style='color:white;'>安全生产通知事项&nbsp;<span style='color:red;'>&nbsp;{{totalSize==null?0:totalSize}}</span>&nbsp;&nbsp;条</span></a><div class="daib-line"></div></li>
             </ul>
         </div>

src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationList-approval.html

@@ -20,8 +20,8 @@
                                     <div ng-hide="!isNotEdit" class="form-group has-feedback"  >
 		                                <table class="table table-striped table-bordered table-hover" ng-repeat="audit in auditList" >
 		                                	<tr>
-		                                		<td  rowspan="3" width='10%'  >
-		                                			<label class="label"  style="margin-top: 45%;text-align: center;">{{audit.taskName}}</label>
+		                                		<td  rowspan="2" width='10%'  >
+		                                			<label class="label"  style="margin-top: 35%;text-align: center;">{{audit.taskName}}</label>
 		                                		</td>
 		                                		<td>
 		                                			<label class="label" style="margin-top: 9px;text-align: center;">处理人</label>
@@ -32,26 +32,26 @@
 		                                		<td >
 		                                			<label class="label" style="margin-top: 9px;text-align: center;">提交部门</label>
 		                                		</td>
-		                                		<td colspan="2" width='30%' style="margin-top: 9px;text-align: center;">
+		                                		<td width='30%' style="margin-top: 9px;text-align: center;">
 		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.fromDepartment}}</label>
 		                                		</td>
 		                                	</tr>
 		                                	<tr>
-		                                		<td rowspan="2">
+		                                		<td>
 		                                			<label class="label" style="margin-top: 20px;text-align: center;">审批意见</label>
 		                                		</td>
-		                                		<td colspan="4" style="margin-top: 9px;text-align: center;">
+		                                		<td colspan="3" style="margin-top: 9px;text-align: center;">
 		                                			<label class="label" style="margin-top: 9px;text-align: center;">{{audit.content}}</label>
 		                                		</td>
 		                                	</tr>
-		                                	<tr>
-		                                		<td colspan="3" style="border-top: 0px;border-right: 0px;">
-		                                			<!-- 签字前面 -->
-		                                		</td>
-		                                		<td width='30%' style="border-top: 0px;border-left: 0px;">
-		                                		电子签名
-		                                		</td>
-		                                	</tr>
+<!--		                                	<tr>-->
+<!--		                                		<td colspan="3" style="border-top: 0px;border-right: 0px;">-->
+<!--		                                			&lt;!&ndash; 签字前面 &ndash;&gt;-->
+<!--		                                		</td>-->
+<!--		                                		<td width='30%' style="border-top: 0px;border-left: 0px;">-->
+<!--		                                		电子签名-->
+<!--		                                		</td>-->
+<!--		                                	</tr>-->
 		                                </table>
 		                                <input type="text" ng-model="state" ng-hide="false" name="state" hidden="true">
                                     </div>
@@ -74,6 +74,7 @@
                             </form>
                         </div>
                     </div>
+				</div>
             </article>
         </div>
     </section>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -700,7 +700,7 @@
                         <a has-func="197" href="#"><i class="fa fa-fw fa-folder-open"></i>决策支持</a>
                         <ul>
                             <li has-func="198">
-                                <a data-ui-sref="app.supervise.decisionSupport.storeSuperviseList">库存监管统计</a>
+                                <a data-ui-sref="app.supervise.decisionSupport.foodStatisticsList">粮食品种统计</a>
                             </li>
                             <!--粮食购销统计-->
                             <li has-func="199" data-menu-collapse>

src/main/resources/static/app/supervise/controller/foodStatisticsCtrl.js

@@ -0,0 +1,39 @@
+"use strict";
+
+angular.module('app.supervise')
+.controller("foodStatisticsCtrl", function($scope, $rootScope, $state, $timeout, kcswService) {
+
+    // 获取列表数据
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+    $scope.searchCondition = {houseId : "", pz : ""};
+
+    $scope.loadData = function() {
+        kcswService.getFoodStatistics($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition.houseId, $scope.searchCondition.pz).then(function(data){
+            $scope.pageInfo = data.pageInfo;
+            $scope.foodStatistics = data.foodStatistics;
+        },function(data){
+            console.log(data);
+        });
+    };
+    $scope.loadData();
+
+    $scope.getFoodExport = function() {
+        kcswService.getFoodExport($scope.searchCondition.houseId, $scope.searchCondition.pz).then(function(data){
+            $scope.fileAllpath = data.fileAllpath;
+            // $scope.fileAllpath = "app/agile/service/粮食品种统计模板.xlsx";
+            $timeout(function () {
+                document.getElementById("foodExport").click();
+            },100)
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+            $scope.pageInfo.pageNum = pageNum;
+            $scope.loadData();
+        }
+    }
+});

src/main/resources/static/app/supervise/module.js

@@ -508,19 +508,16 @@ angular.module('app.supervise', ['ui.router','app.basic','app.business','app.ala
                     }
                 }
             })
-            // 库存监管统计
-            .state('app.supervise.decisionSupport.storeSuperviseList', {
-                    url: '/decisionSupport/storeSuperviseList/:id',
+            // 库存粮食品种统计
+            .state('app.supervise.decisionSupport.foodStatisticsList', {
+                    url: '/decisionSupport/foodStatisticsList',
                     data: {
-                        title: '库存监管统计'
-                    },
-                    params:{
-                        isNotEdit : true
+                        title: '粮食品种统计'
                     },
                     views: {
                         "content@app": {
-                            controller: 'numberManageCtrl',
-                            templateUrl: 'app/storage/views/numberManage/numberManage-list.html'
+                            controller: 'foodStatisticsCtrl',
+                            templateUrl: 'app/supervise/views/foodStatistical-list.html'
                         }
                     }
                 }

src/main/resources/static/app/supervise/views/foodStatistical-list.html

@@ -0,0 +1,109 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-12 col-sm-8">
+                                        <div class="form-group">
+                                            <label> 仓房名称:&emsp;
+                                                <select ng-model="searchCondition.houseId" class="form-control input-sm"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in storelist">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                            <label> 粮油品种:
+                                                <select ng-model="searchCondition.pz" class="form-control input-sm"
+                                                        ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                            <a class="btn btn-default btn-sm"  ng-click="loadData()">
+                                                <i class="fa fa-search"></i>&nbsp;查&nbsp;询
+                                            </a>
+                                            <a class="btn btn-default btn-sm"  ng-click="getFoodExport()">
+                                                <i class="fa fa-search"></i>&nbsp;导&nbsp;出
+                                            </a>
+                                            <a ng-href="{{fileAllpath}}" id="foodExport" ng-hide="true"></a>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-3 col-xs-4 hidden-xs">
+                                        <div class="dataTables_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+                                                                ng-options="num as num for num in [10,25,50,100]"
+                                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <table class="table table-striped table-bordered table-hover" width="100%">
+                                    <thead>
+                                    <tr>
+                                        <th rowspan="3" style="text-align:center;vertical-align:middle;">仓号</th>
+                                        <th colspan="5" style="text-align:center;">品种</th>
+                                        <th rowspan="3" style="text-align:center;vertical-align:middle;">品种合计(KG)</th>
+                                    </tr>
+                                    <tr>
+                                        <th rowspan="2" style="text-align:center;vertical-align:middle;">小麦(KG)</th>
+                                        <th rowspan="2" style="text-align:center;vertical-align:middle;">稻谷小计(KG)</th>
+                                        <th colspan="2" style="text-align:center;">稻谷(KG)</th>
+                                        <th rowspan="2" style="text-align:center;vertical-align:middle;">玉米(KG)</th>
+                                    </tr>
+                                    <tr>
+                                        <th style="text-align:center;">中晚籼稻(KG)</th>
+                                        <th style="text-align:center;">粳稻(KG)</th>
+                                    </tr>
+                                    <tr>
+                                        <th style="text-align:center;">总计(KG)</th>
+                                        <th style="text-align:center;">{{foodStatistics.xm}}</th>
+                                        <th style="text-align:center;">{{foodStatistics.dg}}</th>
+                                        <th style="text-align:center;">{{foodStatistics.xd}}</th>
+                                        <th style="text-align:center;">{{foodStatistics.jd}}</th>
+                                        <th style="text-align:center;">{{foodStatistics.ym}}</th>
+                                        <th style="text-align:center;">{{foodStatistics.totalNumber}}</th>
+                                    </tr>
+                                    </thead>
+
+                                    <tbody>
+                                    <tr ng-repeat="foodSpecies in pageInfo.list">
+                                        <td style="text-align:center;">{{storehouseObj[foodSpecies.ch].storehouseName}}</td>
+                                        <td style="text-align:center;">
+                                            <span ng-if="foodSpecies.pz==3164">{{ foodSpecies.kcsl }}</span>
+                                            <span ng-if="foodSpecies.pz!=3164"></span>
+                                        </td>
+                                        <td></td>
+                                        <td style="text-align:center;">
+                                            <span ng-if="foodSpecies.pz==3218 || foodSpecies.pz==3219">{{ foodSpecies.kcsl }}</span>
+                                            <span ng-if="foodSpecies.pz!=3218 && foodSpecies.pz!=3219"></span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <span ng-if="foodSpecies.pz==3220 || foodSpecies.pz==3221">{{ foodSpecies.kcsl }}</span>
+                                            <span ng-if="foodSpecies.pz!=3220 && foodSpecies.pz!=3221"></span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <span ng-if="foodSpecies.pz==3165">{{ foodSpecies.kcsl }}</span>
+                                            <span ng-if="foodSpecies.pz!=3165"></span>
+                                        </td>
+                                        <td></td>
+                                    </tr>
+                                    </tbody>
+
+                                </table>
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+
+    </section>
+
+</div>