fix: 湿度预警

src/main/resources/static/app/business/purchase/controller/purchaseAddCtrl.js

@@ -1,8 +1,10 @@
 "use strict";
 
-angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope, $rootScope, $state, purchaseService, APP_CONFIG, alertService, $stateParams, $filter ) {
+angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope, $rootScope, $state, purchaseService, grainReservesContractService, APP_CONFIG, alertService, $stateParams, $filter ) {
 	// 表单数据
 	$scope.form = {}
+	// 合同列表
+	$scope.passList = []
 
 	// 返回
     $scope.retList = function () {
@@ -22,6 +24,27 @@ angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope,
 		
 	}
 
+	// 获取合同列表
+	grainReservesContractService.getPassPageInfo(1, 100).then(function(data) {
+		$scope.passList = data.list
+	}, function(data) {
+		console.log(data);
+	})
+
+	// 选择合同时，带出付款金额
+	$scope.onPassSelect = function() {
+		if($scope.form.lhcklcxshtbh) {
+			for (var i = 0; i < $scope.passList.length; i++) {
+				var e = $scope.passList[i];
+				if($scope.form.lhcklcxshtbh == e.contractNumber) {
+					$scope.form.lhckskje = e.moneyQuantity
+				}
+			}
+		} else {
+			$scope.form.lhckskje = ''
+		}
+	}
+
 	var validator = $("#violation-form").validate();
 
 	$scope.save = function() {

src/main/resources/static/app/business/purchase/views/add.html

@@ -57,6 +57,7 @@
 													id="lhjzrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
+													placeholder="--请选择--"
 												/>
                                             </label>
                                         </section>
@@ -95,7 +96,7 @@
 													id="lhckckjzrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
-													
+													placeholder="--请选择--"
 												/>
                                             </label>
                                         </section>
@@ -119,8 +120,16 @@
                                         </section>
 										<section class="col col-3">
                                             <label class="label">轮出销售合同编号：</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.lhcklcxshtbh" name="lhcklcxshtbh" ng-disabled="disabled" >
+											<label class="select"> 
+												<select 
+													name="lhcklcxshtbh"
+													ng-model="form.lhcklcxshtbh"
+													ng-disabled="disabled"
+													ng-options="x.contractNumber as x.contractNumber for x  in passList"
+													ng-change="onPassSelect()"
+												>
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
@@ -146,14 +155,14 @@
 													id="lhckskrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
-													
+													placeholder="--请选择--"
 												/>
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">收款金额：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.lhckskje" name="lhckskje" ng-disabled="disabled" >
+                                                <input class="form-control" type="text" ng-model="form.lhckskje" name="lhckskje" ng-disabled="true" placeholder="请选择轮出销售合同编号">
                                             </label>
                                         </section>
 										<section class="col col-3">
@@ -167,7 +176,7 @@
 													id="lhcksjckksrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
-													
+													placeholder="--请选择--"
 												/>
                                             </label>
                                         </section>
@@ -182,6 +191,7 @@
 													id="lhcksjckwcsj"
                                                     onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
 													ng-disabled="disabled"
+													placeholder="--请选择--"
 												/>
                                             </label>
                                         </section>
@@ -240,7 +250,7 @@
 													id="lhrkjzrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
-													
+													placeholder="--请选择--"
 												/>
 											</label>
 										</section>
@@ -291,6 +301,7 @@
 													id="lhrkfksj"
                                                     onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
 													ng-disabled="disabled"
+													placeholder="--请选择--"
 												/>
 											</label>
 										</section>
@@ -311,7 +322,7 @@
 													id="lhrksjrkksrq"
                                                     onClick="WdatePicker({lang:'zh-cn'})"
 													ng-disabled="disabled"
-													
+													placeholder="--请选择--"
 												/>
 											</label>
 										</section>
@@ -326,6 +337,7 @@
 													id="lhrksjrkjssj"
                                                     onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
 													ng-disabled="disabled"
+													placeholder="--请选择--"
 												/>
 											</label>
 										</section>

src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js

@@ -140,4 +140,16 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
     		}
     	}
 	}
+}).directive('stringToNumber', function() {
+    return {
+        require: 'ngModel',
+        link: function(scope, element, attrs, ngModel) {
+            ngModel.$parsers.push(function(value) {
+                return '' + value;
+            });
+            ngModel.$formatters.push(function(value) {
+                return parseInt(value);
+            });
+        }
+    };
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js

@@ -140,4 +140,16 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
     		}
     	}
 	}
+}).directive('stringToNumber', function() {
+    return {
+        require: 'ngModel',
+        link: function(scope, element, attrs, ngModel) {
+            ngModel.$parsers.push(function(value) {
+                return '' + value;
+            });
+            ngModel.$formatters.push(function(value) {
+                return parseInt(value);
+            });
+        }
+    };
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekDetailCtrl.js

@@ -130,4 +130,16 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
     		}
     	}
 	}
+}).directive('stringToNumber', function() {
+    return {
+        require: 'ngModel',
+        link: function(scope, element, attrs, ngModel) {
+            ngModel.$parsers.push(function(value) {
+                return '' + value;
+            });
+            ngModel.$formatters.push(function(value) {
+                return parseInt(value);
+            });
+        }
+    };
 })

src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html

@@ -255,12 +255,12 @@
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>

src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html

@@ -255,12 +255,12 @@
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>

src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html

@@ -271,12 +271,12 @@
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
+														<input type="number" string-to-number ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>

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

@@ -1,12 +1,18 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("humidityWarningThresholdCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
+	.controller("humidityWarningThresholdCtrl", function ($scope, $rootScope, $state, humidityAlarmService, APP_CONFIG, alertService) {
+		// 筛选条件
+		$scope.search = {
+			storehouseName: '',
+			startDate: '',
+			endDate: '',
+		}
 		// 默认分页
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};
 		// 加载列表
 		$scope.loadData = function () {
-			warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
+			humidityAlarmService.getAlarmList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId, $scope.search).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
 				// console.log(data);

src/main/resources/static/app/supervise/service/humidityAlarmService.js

@@ -0,0 +1,32 @@
+"use strict";
+
+angular.module('app.supervise').service("humidityAlarmService", function($http, $q, APP_CONFIG, $rootScope) {
+    /**
+     * 查询湿度报警列表，支持分页
+     */
+    this.getAlarmList = function(pageNum, pageSize, orgId, search ) {
+		if(!search) {
+			search = {}
+		}
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/humidityAlarm/getAlarmList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+				orgId: orgId,
+				storehouseName: search.storehouseName || '',
+				startDate: search.startDate || '',
+				endDate: search.endDate || '',
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+});

src/main/resources/static/app/supervise/views/humidityWarningThreshold.html

@@ -22,17 +22,17 @@
 											<span class="fa fa-print"></span>&nbsp;打&nbsp;印
 										</a>&emsp;
 										<label> 仓房名称:&emsp;
-											<select ng-model="search.vCfCode" class="form-control input-sm"
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
+											<select ng-model="search.storehouseName" class="form-control input-sm"
+												ng-options="store.storehouseName as store.storehouseName for store in storelist">
 												<option value="">请选择</option>
 											</select>&emsp;
 										</label>
 										<label>检查日期：<input style="width: 100px;" class="form-control" type="text"
-												ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+												ng-model="search.startDate" name="startDate" id="startDate"
 												onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
 											--&nbsp;<input style="width: 100px;" class="form-control" type="text"
-												ng-disabled="isArchive" ng-model="search.searchEndDate"
-												name="searchEndDate" id="endDate"
+												ng-disabled="isArchive" ng-model="search.endDate"
+												name="endDate" id="endDate"
 												onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
 										</label>
 										<a class="btn btn-default btn-sm" ng-click="loadData()"> <i
@@ -70,14 +70,22 @@
 											<tr ng-repeat="warning in pageInfo.list">
 												<td style="text-align:center;">{{ $index + 1 }}</td>
 												<td style="text-align:center;">
-													{{ storeHouseCodeObj[warning.vCfCode].storehouseName }}
+													{{ warning.storehouseName }}
 												</td>
-												<td style="text-align:center;">{{ dicData[warning.wModule]}}</td>
-												<td style="text-align:center;">{{ dicData[warning.wName]}}</td>
-												<td style="text-align:center;">{{ warning.wThreshold }}</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
 												<td style="text-align:center;">
-													{{ warning.wTime | date:'yyyy-MM-dd HH:mm:ss' }}
+													{{ warning.moduleName }}
+												</td>
+												<td style="text-align:center;">
+													{{ warning.alarmName }}
+												</td>
+												<td style="text-align:center;">
+													{{ warning.warningValue }}
+												</td>
+												<td style="text-align:center;">
+													{{ warning.alarmContent }}
+												</td>
+												<td style="text-align:center;">
+													{{ warning.alarmDate | date:'yyyy-MM-dd HH:mm:ss' }}
 												</td>
 											</tr>
 										</tbody>