1

src/main/resources/static/app/business/deliveryStorageNotice/controller/receiveContractListModalCtrl.js

@@ -26,12 +26,12 @@ angular.module('app.business').controller("receiveContractListModalCtrl",
              $scope.loadData();
          }
     }
-    
+
     // 关闭模态窗口
     $scope.cancel = function() {
         $uibModalInstance.close();
     }
-    
+
     // 选择.
     $scope.selectContractReceive = function(contractReceive) {
         $uibModalInstance.close(contractReceive);

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

@@ -1203,6 +1203,9 @@
                             <i class="fa fa-lg fa-fw fa-folder-open"></i>损溢单
                         </a>
                         <ul>
+                            <li has-func="493" data-ui-sref-active="active">
+                                <a data-ui-sref="app.storage.spill.rksfzzqrd">入库水分、杂质确认单</a>
+                            </li>
                             <li has-func="483" data-ui-sref-active="active">
                                 <a data-ui-sref="app.storage.spill.profitlossStatement-apply">损溢单申请</a>
                             </li>

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

@@ -1622,6 +1622,19 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                 }
             })
             
+            .state('app.storage.spill.rksfzzqrd', {
+                url: '/storage/spill/rksfzzqrd',
+                data: {
+                    title: '入库水分、杂质确认单'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'rksfzzqrdCtrl',
+                        templateUrl: 'app/storage/profitlossStatement/views/rksfzzqrd-list.html'
+                    }
+                }
+            })
+
             .state('app.storage.spill.profitlossStatement-apply', {
                 url: '/storage/spill/profitlossStatement-apply',
                 data: {

src/main/resources/static/app/storage/profitlossStatement/controller/profitlossStatementSaveCtrl.js

@@ -107,7 +107,13 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 	 * 实际损耗数量(kg)
 	 */
 	$scope.getSjshsl = function(rksl,cksl){
-	    $scope.profitlossStatement.sjshsl =commonUtilService.accSub(rksl,cksl); 
+		if (rksl > cksl) {
+			$scope.profitlossStatement.sjshsl = commonUtilService.accSub(rksl,cksl);
+			$scope.profitlossStatement.yysl = 0;
+		} else {
+			$scope.profitlossStatement.sjshsl = 0;
+			$scope.profitlossStatement.yysl = commonUtilService.accSub(cksl, rksl);
+		}
 	}
 	
 	/**
@@ -118,6 +124,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 			var params = [];
 			params.rksl = rksl; //入库数量
 			params.cksl = cksl; //出库数量
+
 	        var uibModalInstance = $uibModal.open({
 	            size:'md',
 	            templateUrl: 'app/storage/profitlossStatement/views/sjshsl-list-model.html',
@@ -282,7 +289,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 		
 		
 		//水分
-		if(rksf <= fczjsf){
+		if(parseFloat(rksf) <= parseFloat(fczjsf)){
 			$scope.profitlossStatement.rksfjl = 0;
 		}else{
 			var a = commonUtilService.accSub(rksf,fczjsf);
@@ -293,7 +300,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 		}
 		
 		//杂质
-		if(rkzz <= fczjzz){
+		if(parseFloat(rkzz) <= parseFloat(fczjzz)){
 			$scope.profitlossStatement.rkzzjl = 0;
 		}else{
 			var a = commonUtilService.accSub(rkzz,fczjzz);
@@ -361,10 +368,10 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 	$scope.getCcsfzzjl = function(rksl,cksf,fczjsf,ckzz,fczjzz){
 		
 		//水分
-		if(cksf >= fczjsf){
+		if(parseFloat(cksf) >= parseFloat(fczjsf)){
 			$scope.profitlossStatement.ccqjsfjl = 0;
 		}else{
-			var a = commonUtilService.accSub(fczjsf,cksf);//平仓验收水分%－出仓水分%
+			var a = commonUtilService.accSub(fczjsf,cksf);//封仓验收水分%－出仓水分%
 			
 			var b = commonUtilService.accMul($scope.profitlossStatement.rksl,a);//入仓数量×（平仓验收杂质%－出仓杂质%）
 			var c = commonUtilService.accSub(100,cksf);//（1－出仓水分%）
@@ -373,7 +380,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 		}
 		
 		//杂质
-		if(ckzz >= fczjzz){
+		if(parseFloat(ckzz) >= parseFloat(fczjzz)){
 			$scope.profitlossStatement.ccqjzzjl  = 0;
 		}else{
 			var a = commonUtilService.accSub(fczjzz,ckzz);//平仓验收杂质%－出仓杂质%
@@ -506,38 +513,41 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 	$scope.getCksfzz = function(ch,hwh,rksj){
 		var ch = parseInt(ch);
 		$scope.pageInfo = {pageNum: 1, pageSize: 9999};
-		$scope.search = {ch:ch,hwh:hwh,rksj:rksj} //5是第三方检查的  0是最新数据
-		qualitycheckService.getNewPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,5,null,ch,hwh,$scope.orgId,0).then(function(data) {
-           
-            if(data.list.length>0){
-            	$scope.profitlossStatement.cksf = data.list[0].water;//水分
-            	$scope.profitlossStatement.ckzz = data.list[0].impurityTotal;//杂质
+		$scope.search = {ch:ch,hwh:hwh,rksj:rksj} //3是出库检查的  1是查询已经归档的数据,2是查询已经处理完第二步的数据
+		qualitycheckService.queryCheckDataDetail(ch, hwh, 3, 1, 2).then(function(data) {
+           console.log(data);
+            if(data != null){
+            	$scope.profitlossStatement.cksf = data.qualitycheck.water;//水分
+            	$scope.profitlossStatement.ckzz = data.qualitycheckInspection.impurityTotal;//杂质
+            	if ($scope.profitlossStatement.ckzz == undefined) {
+            		$scope.profitlossStatement.ckzz = 0;
+            	}
             	$scope.cksfzz = true;
             	
             }else{
             	$scope.cksfzz = false;
             }
-			
+
+            if($scope.profitlossStatement.cksf != null && $scope.profitlossStatement.ckzz != null){
+            	
+            	
+            	//储存期间水分杂质减量
+            	/**
+            	 * 储存期间水分减量=入仓数量×（平仓验收水分%－出仓水分%）/（1－出仓水分%）
+            	 * 储存期间杂质减量=入仓数量×（平仓验收杂质%－出仓杂质%）/（1－出仓杂质%）
+            	 */
+            	$scope.getCcsfzzjl($scope.profitlossStatement.rksl,$scope.profitlossStatement.cksf,$scope.profitlossStatement.fczjsf,
+            			$scope.profitlossStatement.ckzz,$scope.profitlossStatement.fczjzz);
+            	
+            	//倒仓出库数量 取封仓时间 到现在时间段的 倒仓通知单的数量
+            	$scope.dccksl($scope.fcsj,$scope.profitlossStatement.rksl,$scope.profitlossStatement.cksl,ch,hwh);
+            	
+            	
+            }
         }, function (data) {
 			console.log(data);
 		});
 		
-		if($scope.profitlossStatement.cksf != null && $scope.profitlossStatement.ckzz != null){
-			
-			
-			//储存期间水分杂质减量
-			/**
-			 * 储存期间水分减量=入仓数量×（平仓验收水分%－出仓水分%）/（1－出仓水分%）
-			 * 储存期间杂质减量=入仓数量×（平仓验收杂质%－出仓杂质%）/（1－出仓杂质%）
-			 */
-			$scope.getCcsfzzjl($scope.profitlossStatement.rksl,$scope.profitlossStatement.cksf,$scope.profitlossStatement.fczjsf,
-					$scope.profitlossStatement.ckzz,$scope.profitlossStatement.fczjzz);
-			
-			//倒仓出库数量 取封仓时间 到现在时间段的 倒仓通知单的数量
-			$scope.dccksl($scope.fcsj,$scope.profitlossStatement.rksl,$scope.profitlossStatement.cksl,ch,hwh);
-			
-			
-		}
 	}
 	
 	
@@ -700,44 +710,44 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
     			/**
     			 * 入库的数据
     			 */
-            	grainCardService.findGrainCard($scope.lqkList.qualitycheckId).then(function(data){//根据粮情卡的质检id查询质检的数据
-        			if(data.cardOnetList.length > 0){
+            	grainCardService.findGrainCard($scope.lqkList.qualitycheckId).then(function(grainCarddata){//根据粮情卡的质检id查询质检的数据
+        			if(grainCarddata.cardOnetList.length > 0){
         				/**
         				 * 质检的详情
         				 */
-        				$scope.profitlossStatement.dj = data.cardOnetList[0].level; //等级
-        				$scope.profitlossStatement.pz = data.cardOnetList[0].subType; //品种
+        				$scope.profitlossStatement.dj = grainCarddata.cardOnetList[0].level; //等级
+        				$scope.profitlossStatement.pz = grainCarddata.cardOnetList[0].subType; //品种
         				//$scope.profitlossStatement.mxpz = data.cardOnetList[0].subTypeDetailed; //明细品种
-        				$scope.profitlossStatement.lsxz = data.cardOnetList[0].quality; //性质
+        				$scope.profitlossStatement.lsxz = grainCarddata.cardOnetList[0].quality; //性质
         				
-        				$scope.profitlossStatement.rksl = data.cardOnetList[0].number;//入库数量(kg)
+        				$scope.profitlossStatement.rksl = grainCarddata.cardOnetList[0].number;//入库数量(kg)
         				//$scope.profitlossStatement.rksj = $filter('date')(data.cardOnetList[0].zhycsj, "yyyy-MM-dd hh:mm:ss");//入库时间(最后一车的时间)
-        				$scope.inputTime = data.cardOnetList[0].inputTime;//入库第一车的时间
+        				$scope.inputTime = grainCarddata.cardOnetList[0].inputTime;//入库第一车的时间
         				$scope.profitlossStatement.dycrksj = $scope.inputTime;
         				if($scope.profitlossStatement.hwid != null){//仓房 粮食
-        					$scope.profitlossStatement.fczjsf = data.cardOnetList[0].water;//封仓自检水分
-            				$scope.profitlossStatement.fczjzz = data.cardOnetList[0].qualitycheckInspection.impurityTotal;//封仓自检杂质
+        					$scope.profitlossStatement.fczjsf = grainCarddata.cardOnetList[0].water;//封仓自检水分
+            				$scope.profitlossStatement.fczjzz = grainCarddata.cardOnetList[0].qualitycheckInspection.impurityTotal;//封仓自检杂质
         				}else{//油罐
-        					$scope.profitlossStatement.fczjsf = data.cardOnetList[0].qualitycheckInspection.waterVolatiles;//封仓自检水分
-            				$scope.profitlossStatement.fczjzz = data.cardOnetList[0].qualitycheckInspection.insolubleImpurity;//封仓自检杂质
+        					$scope.profitlossStatement.fczjsf = grainCarddata.cardOnetList[0].qualitycheckInspection.waterVolatiles;//封仓自检水分
+            				$scope.profitlossStatement.fczjzz = grainCarddata.cardOnetList[0].qualitycheckInspection.insolubleImpurity;//封仓自检杂质
         				}
         				
         				/**
         		    	 * 出库时间以及出库数量(sql)
         		    	 */
         		    	
-        		    	profitlossStatementService.getCksl($scope.storehouseId,hwid,$scope.profitlossStatement.rksj).then(function(data){
-        		    		if(data.length>0){
+        		    	profitlossStatementService.getCksl($scope.storehouseId,hwid,$scope.profitlossStatement.rksj).then(function(profitlossStatementdata){
+        		    		if(profitlossStatementdata.length>0){
         		    			$scope.profitlossStatement.cksl = 0;
-                				$scope.profitlossStatement.cksj = $filter('date')(data[0].rq, "yyyy-MM-dd hh:mm:ss");//出库时间为最后一车的出库时间
+                				$scope.profitlossStatement.cksj = $filter('date')(profitlossStatementdata[0].rq, "yyyy-MM-dd hh:mm:ss");//出库时间为最后一车的出库时间
 
-        						for (var i = 0; i < data.length; i++) {
-        							$scope.profitlossStatement.cksl += data[i].zcsl;//出库数量 取入库时间到出库时间之内 所有出库数量的总和
+        						for (var i = 0; i < profitlossStatementdata.length; i++) {
+        							$scope.profitlossStatement.cksl += profitlossStatementdata[i].zcsl;//出库数量 取入库时间到出库时间之内 所有出库数量的总和
         						}
         						
         						//存储年限
             					$scope.getCcnx($scope.profitlossStatement.rksj,$scope.profitlossStatement.cksj,$scope.storehouseId,hwid);
-            					//实际损耗数量(kg)
+            					//实际损耗数量和溢余数量(kg)
             					$scope.getSjshsl($scope.profitlossStatement.rksl,$scope.profitlossStatement.cksl);
             					//入库水分 入仓时间(第一车),入库时间(最后一车的时间)
             					$scope.getRksfzz($scope.storehouseId,hwid,$scope.inputTime,$scope.profitlossStatement.rksj);
@@ -747,12 +757,12 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
             					
         		    		}
         					
-        		    	},function (data) {
-        					console.log(data);
+        		    	},function (profitlossStatementdata) {
+        					console.log(profitlossStatementdata);
         				});
         			}
-        		},function (data) {
-        			console.log(data);
+        		},function (grainCarddata) {
+        			console.log(grainCarddata);
         		});
             }
     		

src/main/resources/static/app/storage/profitlossStatement/controller/rksfzzqrdCtrl.js

@@ -0,0 +1,95 @@
+angular.module('app.storage').controller("rksfzzqrdCtrl", 
+    function($scope, $http, $state, $rootScope, APP_CONFIG, $uibModal, rksfzzqrdService) {
+    
+	$scope.pageInfo = {pageNum : 1, pageSize : 10};
+
+	// 获取列表数据
+    $scope.loadData = function() {
+
+    	rksfzzqrdService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId).then(function(data){
+            $scope.pageInfo = data;
+        },function(data){
+            console.log(data);
+        });
+    }
+
+    $scope.loadData();
+
+    // 翻页
+	$scope.goPage = function(pageNum) {
+		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+     		$scope.pageInfo.pageNum = pageNum;
+     		$scope.loadData();
+     	}
+	}
+	
+	$scope.submit = function(rksfzzqrd) {
+		if (rksfzzqrd.rksf == null || rksfzzqrd.rkzz == null) {
+			alert("请先录入入库水分和入库杂质");
+			return;
+		}
+		if (!confirm("已经确定无误了吗？确定后将不可再次修改！")) {
+            return;
+        }
+		rksfzzqrdService.edit(rksfzzqrd).then(function(data){
+            alert(data.msg);
+            $scope.loadData();
+        },function(data){
+            console.log(data);
+        });
+	}
+	
+	$scope.edit = function(index) {
+		$scope.obj = $scope.pageInfo.list[index];
+		console.log($scope.obj);
+
+		var params = [];
+		var uibModalInstance = $uibModal.open({
+		    size:'md',
+		    templateUrl: 'app/storage/profitlossStatement/views/rksf-list-model.html',
+		    controller: 'rksfModalCtrl',
+		    resolve: {
+		        // items是一个回调函数
+		        items: function () {
+		            // 这个值会被模态框的控制器获取到
+		            return params;
+		        }
+		    }
+		});
+		uibModalInstance.result.then(function (result) {
+		    if (result != null) {
+		    	$scope.obj.rksf = result.rksf;
+		    	$scope.obj.rkzz = result.rkzz;
+		    	$scope.pageInfo.list[index] = $scope.obj;
+		    }
+		    // 关闭模态框时刷新页面数据
+		}, function (reason) {
+		    console.log(reason);
+		});
+	}
+
+})
+.controller("rksfModalCtrl", function($scope, $uibModalInstance, $filter, $http, $uibModal,$rootScope, APP_CONFIG, items) {
+
+
+	var validators;
+	$.validator.addMethod("checkDouble1",function(value,element, params) {
+		var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1})?$/;
+		return this.optional(element)||(checkNumber.test(value));
+	},"请输大于 0的数，且小数位最多保留1位！");
+	validators = $("#rksf-form").validate();
+
+    // 确定
+    $scope.submit = function(o) {
+    	validators = $("#rksfzzqrd-form").validate();
+    	if (validators.form()) {
+    	    $uibModalInstance.close(o);
+    	}
+    }
+
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    }
+
+});

src/main/resources/static/app/storage/profitlossStatement/controller/sjshslListModalCtrl.js

@@ -6,7 +6,13 @@ angular.module('app.storage').controller("sjshslListModalCtrl",
     if (items != undefined) {
     	$scope.rksl = items.rksl;
     	$scope.cksl = items.cksl;
-    	$scope.sjshsl =commonUtilService.accSub($scope.rksl,$scope.cksl); 
+    	if (parseFloat($scope.rksl) > parseFloat($scope.cksl)) {
+    		$scope.sjshsl = commonUtilService.accSub($scope.rksl,$scope.cksl); 
+			$scope.yysl = 0;
+		} else {
+			$scope.yysl = commonUtilService.accSub($scope.cksl, $scope.rksl);
+			$scope.sjshsl = 0;
+		}
     }
    
     

src/main/resources/static/app/storage/profitlossStatement/service/rksfzzqrdService.js

@@ -0,0 +1,43 @@
+"use strict";
+
+angular.module('app.storage').service("rksfzzqrdService", function($http, $rootScope,$q, APP_CONFIG) {
+    this.getPageInfo = function(pageNum, pageSize, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.keeperHouseUrl + '/StorageRksfzzqrdController/getList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
+    //确定
+	this.edit = function (rksfzzqrd) {
+		var orgId = $rootScope.orgInfo.orgId;
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.keeperHouseUrl + '/StorageRksfzzqrdController/update',
+			data : {
+				rksfzzqrd : angular.toJson(rksfzzqrd)
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	};
+})

src/main/resources/static/app/storage/profitlossStatement/views/profitlossStatement-edit.html

@@ -87,7 +87,7 @@
 											<div class="col-xs-15 col-sm-15" style="margin-top:10px">
 												<table class="table table-striped  table-bordered table-hover" width="100%">
 													<tr>
-													    <td class="text-center" rowspan="4" style="vertical-align: middle;">出入库信息</td>
+													    <td class="text-center" rowspan="5" style="vertical-align: middle;">出入库信息</td>
 														<td style="vertical-align: middle;" width='20%'>入库时间<span style="color: red;text-align: center; ">*</span></td>
 														<td width='25%'>
 															<label class="input">
@@ -132,13 +132,22 @@
 															</label>
 														</td>
 													</tr>
+													<tr>
+														<td style="vertical-align: middle;"><span style="color: blue;">溢余数量(kg)</span></td>
+														<td colspan="4">
+															<label class="input">
+																<input type="text" ng-model="profitlossStatement.yysl" name="yysl" ng-readonly="true"
+																ng-click="getSjshslMtk(profitlossStatement.rksl,profitlossStatement.cksl)"  required/>
+															</label>
+														</td>
+													</tr>
 												</table>
 											</div>
 											
 											<div class="col-xs-15 col-sm-15" style="margin-top:10px">
 												<table class="table table-striped  table-bordered table-hover" width="100%">
 													<tr>
-													    <td class="text-center" rowspan="10" style="vertical-align: middle;">超耗计算</td>
+													    <td class="text-center" rowspan="10" style="vertical-align: middle;">损耗数量</td>
 														<td style="vertical-align: middle;" width='20%'><span style="color: blue;">入仓水分(%)</span></td>
 														<td width='25%'>
 															<label class="input">
@@ -283,7 +292,15 @@
 											<div class="col-xs-15 col-sm-15" style="margin-top:10px">
 												<table class="table table-striped  table-bordered table-hover" width="100%">
 													<tr>
-													    <td class="text-center" rowspan="4" style="vertical-align: middle;">结论</td>
+														<td style="vertical-align: middle;" width='20%'>损失数量(kg)<span style="color: red;">*</span></td>
+														<td width='25%' colspan="4">
+															<label class="input">
+																 <input type="text" ng-model="profitlossStatement.sssl" name="sssl" ng-readonly="isNotEdit"
+																  placeholder="例如: 填写因保管不善、自然灾害、责任事故等造成虫蚀、霉烂变质、污染等损失" validNumber=true required />
+															</label>
+														</td>
+													</tr>
+													<tr>
 														<td style="vertical-align: middle;" width='20%'><span style="color: blue;">超耗数量(kg)</span></td>
 														<td width='25%'>
 															<label class="input">

src/main/resources/static/app/storage/profitlossStatement/views/rksf-list-model.html

@@ -0,0 +1,36 @@
+<div class="modal-content">
+	<div class="modal-header">
+		<button type="button" class="close" ng-click="cancel()">
+			&times;</button>
+		<h4 class="modal-title" id="myModalLabelssss">编辑入库水分和入库杂质</h4>
+	</div>
+
+	<div class="modal-body">
+		<form id="rksfzzqrd-form" name='rksfzzqrd-form'
+			class="smart-form ng-pristine ng-valid"
+			data-validator-option="validateOptions" novalidate="novalidate">
+			<fieldset>
+				<div class="row">
+					<section class="col col-4">
+						<label>入库水分<span style="color: red;">*</span></label>
+						<label class="input">
+							<input type="text" ng-model="o.rksf" name="rksf" checkDouble1="true" required maxlength="10" />
+						</label>
+					</section>
+					<section class="col col-4">
+						<label>入库杂质<span style="color: red;">*</span></label>
+						<label class="input">
+							<input type="text" ng-model="o.rkzz" name="rkzz" checkDouble1="true" required maxlength="10" />
+						</label>
+					</section>
+				</div>
+			</fieldset>
+		</form>
+	</div>
+	<div class="modal-footer">
+		<button ng-click="submit(o)" type="button" ng-hide="isNotEdit"
+			class="btn btn-primary">确定</button>
+		<button ng-click="cancel()" class="btn btn-default"
+			data-dismiss="modal">取消</button>
+	</div>
+</div>

src/main/resources/static/app/storage/profitlossStatement/views/rksfzzqrd-list.html

@@ -0,0 +1,90 @@
+<!-- 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">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>损溢单申请列表</h2>
+                    </header>
+                    <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-10">
+	                                    <div class="form-group">
+	                                        <label style="font-size: 14px;font-weight: bold;">
+	                                        	计算规则：<br/>
+	                                        	入库水分=（第1车入仓粮食数量×当前车检验水分+第2车入仓粮食数量×当前车检验水分+……+最后1车入仓粮食数量×当前车检验水分）/入仓粮食总数×100%<br/>
+                                                                                                入库杂质=（第1车入仓粮食数量×当前车检验杂质+第2车入仓粮食数量×当前车检验杂质+……+最后1车入仓粮食数量×当前车检验杂质）/入仓粮食总数×100%<br/>
+	                                        </label>
+	                                    </div>
+	                                </div>
+									<div class="col-sm-2 col-xs-6 hidden-xs">
+										<div class="dataTables_length">
+											<label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData(pageInfo.pageNum=1)"
+																ng-options="num as num for num in [1,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>序号</th>
+			                            <th>仓房名称</th>
+			                            <th>货位名称</th>
+			                            <th>粮食品种</th>
+			                            <th>粮食等级</th>
+			                            <th>入库时间</th>
+			                            <th>入库水分%</th>
+			                            <th>入库杂质</th>
+			                            <th>操作</th>
+			                        </tr>
+		                        </thead>
+		                        
+		                        <tbody>
+		                            <tr ng-repeat="rksfzzqrd in pageInfo.list">
+		                            	<td>{{$index+1}}</td>
+		                                <td>{{rksfzzqrd.cfmc}}</td>
+                                        <td>{{rksfzzqrd.hwmc}}</td>
+		                                <td>{{rksfzzqrd.lypz}}</td>
+		                                <td>{{rksfzzqrd.lydj}}</td>
+		                                <td>{{rksfzzqrd.jksj | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+		                                <td>
+		                                  <span ng-if="rksfzzqrd.rksf==null" style="color: red;">请编辑</span>
+		                                  <span ng-if="rksfzzqrd.rksf!=null">
+		                                      {{rksfzzqrd.rksf}}
+		                                  </span>
+		                                </td>
+		                                <td>
+		                                  <span ng-if="rksfzzqrd.rkzz==null"  style="color: red;">请编辑</span>
+		                                  <span ng-if="rksfzzqrd.rkzz!=null">
+		                                      {{rksfzzqrd.rkzz}}
+		                                  </span>
+		                                </td>
+		                                <td>
+		                                    <div>
+												<a href-void ng-click="submit(rksfzzqrd)" ng-hide="rksfzzqrd.sfqr=='0'"><i class="fa fa-pencil-square"></i>确认</a>
+												<a href-void ng-click="edit($index)" ng-show="rksfzzqrd.rksf==null || rksfzzqrd.rkzz==null"><i class="fa fa-pencil-square"></i>编辑</a>
+		                                    </div>
+		                                </td>
+		                            </tr>
+		                        </tbody>
+	                        </table>
+							 <div smart-include="app/layout/partials/page.tpl.html"></div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/storage/profitlossStatement/views/sjshsl-list-model.html

@@ -10,10 +10,13 @@
             <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-6">
+                        <div class="col-xs-12 col-sm-9">
                             <div class="dataTables_filter">
                                 <label>
-                                	实际损耗数量 = 入库数量 - 出库数量
+                                	实际损耗数量(入库数大于出库数) = 入库数量 - 出库数量
+                                </label>
+                                <label>
+                                	溢余数量(入库数小于出库数) = 出库数量 - 入库数量
                                 </label>
                             </div>
                         </div>
@@ -23,6 +26,7 @@
                         <thead>
                             <tr>
                                  <th>实际损耗数量(kg)</th>
+                                 <th>溢余数量(kg)</th>
 				      			 <th>入库数量(kg)</th>
 				                 <th>出库数量(kg)</th>
                             </tr>
@@ -31,6 +35,7 @@
                         <tbody>
                             <tr>
                                 <td>{{ sjshsl}}</td>
+                                <td>{{ yysl}}</td>
                                 <td>{{ rksl }}</td>
                                 <td>{{ cksl }}</td> 
                             </tr>

src/main/resources/static/app/storage/service/qualitycheckService.js

@@ -381,6 +381,29 @@ angular.module('app.storage').service("qualitycheckService", function($http, $q,
         });
         return d.promise;
     }
-    
+
+    //根据条件查找一条质检数据详情
+    this.queryCheckDataDetail = function(houseId, wareId, checkType, historyStatus, processState) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.qualitycheckUrl + '/qualitycheck/queryCheckDataDetail',
+            params : {
+            	houseId : houseId,
+            	wareId : wareId,
+            	checkType : checkType,
+            	historyStatus : historyStatus,
+            	processState : processState,
+            	orgId : $rootScope.orgInfo.orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 
 });