Преглед изворни кода

成品粮粮情和成品粮分仓保管账功能变更

fanxw пре 2 година
родитељ
комит
80d3ba1de4

+ 1 - 0
src/main/resources/static/app/storage/grainCard/views/productGrain-add.html

@@ -206,6 +206,7 @@
206
                                                         <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
206
                                                         <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
207
                                                             <option value="">--请选择--</option>
207
                                                             <option value="">--请选择--</option>
208
                                                             <option value="包装垛存">包装垛存</option>
208
                                                             <option value="包装垛存">包装垛存</option>
209
+                                                            <option value="散存">包装垛存</option>
209
                                                             <option value="油罐">油罐</option>
210
                                                             <option value="油罐">油罐</option>
210
                                                         </select><i></i>
211
                                                         </select><i></i>
211
                                                         <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"
212
                                                         <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"

+ 2 - 2
src/main/resources/static/app/storage/product/controller/productCtrl.js

@@ -399,7 +399,7 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
399
 						$scope.productEdit.productionDate = $filter('date')(item.realValue, "yyyy-MM-dd HH:mm:ss");
399
 						$scope.productEdit.productionDate = $filter('date')(item.realValue, "yyyy-MM-dd HH:mm:ss");
400
 					}
400
 					}
401
 				});
401
 				});
402
-				if ($scope.productEdit.storage == 1) {
402
+				if ($scope.productEdit.storage != 2) {
403
 					$("input[name='recordDateJJ']").each(function (j, item) {
403
 					$("input[name='recordDateJJ']").each(function (j, item) {
404
 						if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
404
 						if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
405
 							$scope.productEdit.recordDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
405
 							$scope.productEdit.recordDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
@@ -563,7 +563,7 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
563
 			$scope.productEdit.levels = Number($scope.productEdit.levels);
563
 			$scope.productEdit.levels = Number($scope.productEdit.levels);
564
 			$scope.productEdit.storehouseType = Number($scope.productEdit.storehouseType);
564
 			$scope.productEdit.storehouseType = Number($scope.productEdit.storehouseType);
565
 			var nums = parseFloat($scope.productEdit.specifications);//规格
565
 			var nums = parseFloat($scope.productEdit.specifications);//规格
566
-			if($scope.productEdit.storage == "1"){//只有分件这样计算
566
+			if($scope.productEdit.storage != "2"){//只有分件这样计算
567
 				if($scope.productEdit.inventoryQuantity !== undefined && $scope.productEdit.inventoryQuantity !== ""){//入库
567
 				if($scope.productEdit.inventoryQuantity !== undefined && $scope.productEdit.inventoryQuantity !== ""){//入库
568
 					$scope.storage = ((parseFloat($scope.productEdit.inventoryQuantity)*1000) / (parseFloat(nums)*1000));
568
 					$scope.storage = ((parseFloat($scope.productEdit.inventoryQuantity)*1000) / (parseFloat(nums)*1000));
569
 				}
569
 				}

+ 8 - 7
src/main/resources/static/app/storage/product/views/product-edit.html

@@ -188,6 +188,7 @@
188
 														<select name="storage" ng-model="productEdit.storage" required>
188
 														<select name="storage" ng-model="productEdit.storage" required>
189
 															<option value="">--请选择--</option>
189
 															<option value="">--请选择--</option>
190
 															<option value="1">包装垛存</option>
190
 															<option value="1">包装垛存</option>
191
+															<option value="3">散存</option>
191
 															<option value="2">油罐</option>
192
 															<option value="2">油罐</option>
192
 														</select> <i></i>
193
 														</select> <i></i>
193
 													</label>
194
 													</label>
@@ -224,19 +225,19 @@
224
 										</table>
225
 										</table>
225
 
226
 
226
 										<!--存储方式切换--><!--分件-->
227
 										<!--存储方式切换--><!--分件-->
227
-										<table ng-show="productEdit.storage==1" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
228
+										<table ng-show="productEdit.storage!=2" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
228
 											<tr>
229
 											<tr>
229
 												<th style="height:20px;" colspan="6"></th>
230
 												<th style="height:20px;" colspan="6"></th>
230
 											</tr>
231
 											</tr>
231
 											<tr>
232
 											<tr>
232
 												<th width='15%'>
233
 												<th width='15%'>
233
-													<label class="label txt-bg-red">规格(吨):<span style="color: red;">*</span></label>
234
+													<label class="label txt-bg-red">规格(吨):</label>
234
 												</th>
235
 												</th>
235
 												<th width='15%'>
236
 												<th width='15%'>
236
 													<label class="input">
237
 													<label class="input">
237
 														<i class="input"></i>
238
 														<i class="input"></i>
238
 														<input type="text" name="specifications" ng-model="productEdit.specifications"
239
 														<input type="text" name="specifications" ng-model="productEdit.specifications"
239
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " required/>
240
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " />
240
 													</label>
241
 													</label>
241
 												</th>
242
 												</th>
242
 												<th width='15%'>
243
 												<th width='15%'>
@@ -271,13 +272,13 @@
271
 													</label>
272
 													</label>
272
 												</th>
273
 												</th>
273
 												<th width='15%'>
274
 												<th width='15%'>
274
-													<label class="label txt-bg-red">入库数量(吨):</label>
275
+													<label class="label txt-bg-red">入库数量(吨):<span style="color: red;">*</span></label>
275
 												</th>
276
 												</th>
276
 												<th width='15%'>
277
 												<th width='15%'>
277
 													<label class="input">
278
 													<label class="input">
278
 														<i class="input"></i>
279
 														<i class="input"></i>
279
 														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity" ng-blur="calculate()" ng-readonly="rksl"
280
 														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity" ng-blur="calculate()" ng-readonly="rksl"
280
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
281
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
281
 													</label>
282
 													</label>
282
 												</th>
283
 												</th>
283
 												<th width='15%'>
284
 												<th width='15%'>
@@ -302,13 +303,13 @@
302
 													</label>
303
 													</label>
303
 												</th>
304
 												</th>
304
 												<th width='15%'>
305
 												<th width='15%'>
305
-													<label class="label txt-bg-red">出库数量(吨):</label>
306
+													<label class="label txt-bg-red">出库数量(吨):<span style="color: red;">*</span></label>
306
 												</th>
307
 												</th>
307
 												<th width='15%'>
308
 												<th width='15%'>
308
 													<label class="input">
309
 													<label class="input">
309
 														<i class="input"></i>
310
 														<i class="input"></i>
310
 														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
311
 														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
311
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
312
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
312
 													</label>
313
 													</label>
313
 												</th>
314
 												</th>
314
 												<th width='15%'>
315
 												<th width='15%'>