Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/storage/controller/keepAccount/houseKeepAccountCtrl.js

@@ -227,13 +227,8 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 		if (butType != 3) { //记账、审核、查看
 			keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.pz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.zy, 0).then(function(data){
 				$scope.account = data.obj;
-				if (butType == 0) { //记账
-					if (data.obj.id != null || data.obj.id != undefined) {
-						alert("当前记录已记账！");
-						return;
-					}
-				} else if (butType == 1) { //审核
-					if (data.obj.id == null || data.obj.id == undefined) {
+				if (butType == 1) { //审核
+					if (!data.obj.id) {
 						alert("当前记录还尚未记账，请先记账！");
 						return;
 					} else {
@@ -248,6 +243,7 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 						return;
 					}
 				}
+				account.id === data.obj.id;
 				$state.go('app.storage.account.houseKeepAccount.houseKeepAccountEdit',{account:angular.toJson(account), butType:butType});
 			},function(data){
 		        console.log(data);
@@ -304,15 +300,17 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 	}
 	$scope.loadWare();
 
-	// 获取列表日数据
+
+	// $scope.butType = $stateParams.butType;
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);
-		$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
 		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
 		$scope.fcbgz.rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");
 		keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.pz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.zy, 0).then(function(data){
 			$scope.account = data.obj;
-
+			//初始分仓保管账表对象数据
+			$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
+			$scope.fcbgz.rq = rq;
 			if ($stateParams.butType == 0) { //记账
 				//初始化数据记账表对象数据
 				$scope.account.houseId = $scope.fcbgz.ch; //仓房
@@ -327,6 +325,8 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 				$scope.account.srsl = $scope.fcbgz.srsl; //入库数量
 				$scope.account.zcsl = $scope.fcbgz.zcsl; //出库数量
 				$scope.account.kcsl = $scope.fcbgz.kcsl; //库存数量
+				$scope.account.sssh = $scope.fcbgz.sssh; //损失损耗
+				$scope.account.zbszsl = $scope.fcbgz.zbszsl; //折标水杂数量
 				$scope.account.accountingPerson = $rootScope.userInfo.realName; //记账人
 				$scope.account.accountingDate = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
 				//设置状态为记账
@@ -357,15 +357,12 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 				//提交按钮影藏
 				$scope.isNotEdit = true;
 			}
-			//初始分仓保管账表对象数据
 			$scope.fcbgz.hwxz = $rootScope.dicData[$scope.fcbgz.hwxz];
 			$scope.fcbgz.pz = $rootScope.dicData[$scope.fcbgz.pz];
 			$scope.fcbgz.dj = $rootScope.dicData[$scope.fcbgz.dj];
-			$scope.fcbgz.rq = rq;
 		},function(data){
 	        console.log(data);
 	    });
-
 	}
 	$scope.edit();
 	

src/main/resources/static/app/storage/controller/keepAccount/keepTotalAccountCtrl.js

@@ -80,6 +80,8 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 		$scope.loadData();
 	}
 
+	$scope.butType = $stateParams.butType;
+
     //页面跳转
     $scope.edit = function(account, butType) {
 		var obj_str = angular.toJson(account);
@@ -88,12 +90,7 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 		if (butType != 3) { //记账、审核、查看
 			keepAccountService.accountingRecord(null, null, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
 				$scope.account = data.obj;
-				if (butType == 0) { //记账
-					if (data.obj.id != null || data.obj.id != undefined) {
-						alert("当前记录已记账！");
-						return;
-					}
-				} else if (butType == 1) { //审核
+				if (butType == 1) { //审核
 					if (data.obj.id == null || data.obj.id == undefined) {
 						alert("当前记录还尚未记账，请先记账！");
 						return;
@@ -109,6 +106,9 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 						return;
 					}
 				}
+
+				account.id === data.obj.id;
+
 				$state.go('app.storage.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType});
 			},function(data){
 		        console.log(data);
@@ -129,11 +129,13 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 	// 获取列表日数据
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);
-		$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
 		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
 		keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
 			$scope.account = data.obj;
-
+			//初始分仓保管账表对象数据
+			$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
+			$scope.fcbgz.rq = rq;
+			
 			if ($stateParams.butType == 0) { //记账
 				//初始化数据记账表对象数据
 				$scope.account.lspz = $scope.fcbgz.lspz;
@@ -142,6 +144,8 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 				$scope.account.srsl = $scope.fcbgz.srsl;
 				$scope.account.zcsl = $scope.fcbgz.zcsl;
 				$scope.account.kcsl = $scope.fcbgz.kcsl;
+				$scope.account.sssh = $scope.fcbgz.sssh; //损失损耗
+				$scope.account.zbszsl = $scope.fcbgz.zbszsl; //折标水杂数量
 				$scope.account.accountingPerson = $rootScope.userInfo.realName; //记账人
 				$scope.account.accountingDate = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
 				$scope.account.remark = $scope.fcbgz.remark; //摘要
@@ -172,11 +176,9 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 				//提交按钮影藏
 				$scope.isNotEdit = true;
 			}
-			//初始分仓保管账表对象数据
 			$scope.fcbgz.hwxz = $rootScope.dicData[$scope.fcbgz.hwxz];
-			$scope.fcbgz.lspz = $rootScope.dicData[$scope.fcbgz.lspz];
+			$scope.fcbgz.pz = $rootScope.dicData[$scope.fcbgz.pz];
 			$scope.fcbgz.dj = $rootScope.dicData[$scope.fcbgz.dj];
-			$scope.fcbgz.rq = rq;
 		},function(data){
 	        console.log(data);
 	    });

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

@@ -188,15 +188,25 @@
 												</label>
 											</th>
 										</tr>
-<!-- 										<tr ng-hide="auditor_th"> -->
-											
-<!-- 											<th> -->
-<!-- 												<label class="label" style="margin-top: 9px;text-align: center;"></label> -->
-<!-- 											</th> -->
-<!-- 											<th> -->
-<!-- 												<label class="select"></label> -->
-<!-- 											</th> -->
-<!-- 										</tr> -->
+										<tr>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">损失损耗(Kg)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="account.sssh" ng-readonly="butType != 0" class="form-control" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">折标水杂数量(Kg)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="account.zbszsl" ng-readonly="butType != 0" class="form-control" />
+												</label>
+											</th>
+											<th colspan="2"></th>
+										</tr>	
 										<tr ng-hide="auditor_th">
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">审核意见</label>

src/main/resources/static/app/storage/views/keepAccount/houseKeepAccount-list.html

@@ -100,6 +100,8 @@
 				                            <th>收入数量(公斤)</th>
 				                            <th>支出数量(公斤)</th>
 				                            <th>库存数量(公斤)</th>
+				                            <th>损失损耗</th>
+				                            <th>折标水杂数量</th>
 				                            <th>记账人</th>
 				                            <th>审核人</th>
 				                            <th>操作</th>
@@ -119,6 +121,8 @@
 			                        		<td>{{account.srsl}}</td>
 			                        		<td>{{account.zcsl}}</td>
 			                        		<td>{{account.kcsl}}</td>
+			                        		<td>{{account.sssh}}</td>
+			                        		<td>{{account.zbszsl}}</td>
 			                        		<td>{{account.accountingPerson}}</td>
 			                        		<td>{{account.auditor}}</td>
 			                        		<td>

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

@@ -135,6 +135,25 @@
 												</label>
 											</th>
 										</tr>
+										<tr>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">损失损耗(Kg)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="account.sssh" ng-readonly="butType != 0" class="form-control" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">折标水杂数量(Kg)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="account.zbszsl" ng-readonly="butType != 0" class="form-control" />
+												</label>
+											</th>
+											<th colspan="2"></th>
+										</tr>
 										<tr ng-hide="auditor_th">
 											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">审核时间</label>

src/main/resources/static/app/storage/views/keepAccount/keepTotalAccount-list.html

@@ -69,6 +69,8 @@
 				                            <th>收入数量(公斤)</th>
 				                            <th>支出数量(公斤)</th>
 				                            <th>库存数量(公斤)</th>
+											<th>损失损耗</th>
+				                            <th>折标水杂数量</th>
 				                            <th>记账人</th>
 				                            <th>审核人</th>
 				                            <th>操作</th>
@@ -86,6 +88,8 @@
 			                        		<td>{{account.srsl}}</td>
 			                        		<td>{{account.zcsl}}</td>
 			                        		<td>{{account.kcsl}}</td>
+											<td>{{account.sssh}}</td>
+			                        		<td>{{account.zbszsl}}</td>
 			                        		<td>{{account.accountingPerson}}</td>
 			                        		<td>{{account.auditor}}</td>
 			                        		<td>