.

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

@@ -112,10 +112,12 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 			var nums = parseFloat($scope.productEdit.specifications);//规格
 			if($scope.productEdit.storage == "1"){//只有分件这样计算
 				if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== ""){//入库
-					$scope.storage = ((parseFloat($scope.productEdit.storageQuantity)*100) / (parseFloat(nums)*100));
+					var storageQuantity = parseFloat($scope.productEdit.storageQuantity);
+					$scope.storage = (storageQuantity*1000) / (nums*1000);
 				}
 				if($scope.productEdit.outboundQuantity !== undefined || $scope.productEdit.outboundQuantity !== ""){//出库
-					$scope.outbound = ((parseFloat($scope.productEdit.outboundQuantity)*100) / (parseFloat(nums)*100));
+					var outboundQuantity = parseFloat($scope.productEdit.outboundQuantity);
+					$scope.outbound = (outboundQuantity*1000) / (nums*1000);
 				}
 			}
 
@@ -256,7 +258,11 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 
 	// 计算库存数量
 	$scope.calculate = function() {
-		var nums = parseFloat($scope.productEdit.specifications);//规格
+		var nums = $scope.productEdit.specifications;//规格
+		var re = /^([0-9]+.[0-9]{3})[0-9]*/;
+		nums = nums.toString().replace(re,"$1");
+		nums = parseFloat(nums);
+		$scope.productEdit.specifications = nums;
 		if($scope.storage !== undefined && $scope.storage !== ""){//入库
 			var storageQuantity = parseFloat($scope.storage);
 			$scope.productEdit.storageQuantity = (storageQuantity * (nums*1000))/1000;

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

@@ -1,345 +0,0 @@
-<!-- MAIN CONTENT -->
-<div id="content">
-
-	<!-- widget grid -->
-	<section id="widget-grid" widget-grid>
-
-		<!-- START ROW -->
-		<div class="row">
-
-			<!-- NEW COL START -->
-			<article class="col-sm-12 col-md-12 col-lg-12">
-
-				<!-- Widget ID (each widget will need unique ID)-->
-				<div jarvis-widget id="form-grid-widget"
-					 data-widget-colorbutton="false" data-widget-editbutton="false"
-					 data-widget-custombutton="false">
-
-					<!-- widget div-->
-					<div>
-
-						<!-- widget content -->
-						<div class="widget-body no-padding">
-							<form id="product-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
-								<button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
-								<header>
-									<a href-void class="btn btn-default btn-xs" ng-click="back()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
-								</header>
-								<header>基础信息</header>
-								<fieldset>
-									<table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
-										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
-											<!--第一个tr开始 -->
-											<tr>
-												<th width='15%'>
-													<label class="label">仓房/油罐名称：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select" ng-hide="edits">
-														<select ng-model="productEdit.houseId" name="houseId" class="form-control input-sm"
-																ng-options="store.storehouseId as store.storehouseName for store in productHouse"
-																ng-change="loadWare(productEdit.houseId)" required>
-															<option value="">--请选择--</option>
-														</select> <i></i>
-													</label>
-													<label class="input" ng-show="edits">
-														<i class="input"></i>
-														<input type="text" name="houseId" ng-model="storehouseName" readonly="readonly"/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label">货位名称：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<select ng-model="productEdit.warehouseId" name="warehouseId" class="form-control input-sm"
-																ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" ng-disabled="isWrite" required>
-															<option value="">--请选择--</option>
-														</select> <i></i>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label">仓房/油罐类型：</label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<select ng-model="productEdit.storehouseType"
-																name="storehouseType" ng-options="enum.enumid as enum.enumname for enum in styleType">
-															<option value="">--请选择--</option>
-														</select> <i></i>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label">粮油品种：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<select name="lspz" ng-model="productEdit.lspz" ng-change="getGrainDetailKind()" required>
-															<option value="">--请选择--</option>
-															<option value="7038">小麦粉</option>
-															<option value="7051">混合小麦粉</option>
-															<option value="7052">压榨成品油</option>
-															<option value="7050">浸出成品油</option>
-															<option value="7107">大米及优质大米</option>
-														</select> <i></i>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label">明细品种：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select" id="grainDetailKind-label">
-														<multi-select-tree
-																disabled-tree="disabled"
-																data-input-model="grainDetailKindTreeData"
-																data-output-model="productEdit.lsmxpz"
-																data-default-label="--请选择--" name="lsmxpz"
-																multi-select="false"
-																select-only-leafs="false">
-														</multi-select-tree>
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="grainDetailKind-error"></span></em>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label">粮油性质：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<multi-select-tree
-																disabled-tree="disabled"
-																data-input-model="grainAttributeTreeData"
-																data-output-model="productEdit.nature"
-																data-default-label="--请选择--"
-																name="nature"
-																select-only-leafs="true"
-																multi-select="false">
-														</multi-select-tree>
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;
-													 line-height:15px;" id="grainAttribute-error"></span></em>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label">粮油等级：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<select ng-model="productEdit.levels" name="levels"
-																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
-															<option value="">--请选择--</option>
-														</select><i></i>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label">产地：</label>
-												</th>
-												<th width='15%'>
-													<label class="select"  id="grainProducingArea-label">
-														<multi-select-tree
-																disabled-tree="disabled"
-																data-input-model="grainProducingAreaTreeData"
-																data-default-label="--请选择--" name="grainProducingArea"
-																multi-select="false"
-																select-only-leafs="false"
-																data-output-model="productEdit.places"
-																name="places"
-																data-callback="selectOnly1Or2(item, selectedItems)">
-														</multi-select-tree>
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;
-					 line-height:15px;" id="grainProducingArea-error"></span></em>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">入库日期：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<label class="input">
-															<input type="text" name="productionDate" ng-model="productEdit.productionDate"
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})">
-														</label>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">存储方式：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="select">
-														<select name="storage" ng-model="productEdit.storage" required>
-															<option value="">--请选择--</option>
-															<option value="1">分件</option>
-															<option value="2">油罐</option>
-														</select> <i></i>
-													</label>
-												</th>
-												<th></th>
-												<th></th>
-												<th></th>
-												<th></th>
-											</tr>
-										</table>
-
-										<!--存储方式切换--><!--分件-->
-										<table ng-show="productEdit.storage==1" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
-											<tr>
-												<th style="height:20px;" colspan="6"></th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">规格（吨）：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="specifications" ng-model="productEdit.specifications"
-															   ng-blur="calculate()" onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " required/>
-													</label>
-												</th>
-												<th></th>
-												<th></th>
-												<th></th>
-												<th></th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">件数：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="storage" ng-model="storage"
-															   ng-blur="calculate()" onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' " required/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">库存数量（吨）：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="inventoryQuantity" ng-model="productEdit.inventoryQuantity" ng-readonly="true"/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">记录日期：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="recordDateJJ" ng-model="productEdit.recordDate"
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})"/>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">记录人：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">审核人：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
-													</label>
-												</th>
-												<th></th>
-												<th></th>
-											</tr>
-										</table>
-
-										<!--存储方式切换--><!--油罐-->
-										<table ng-show="productEdit.storage==2" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
-											<tr>
-												<th style="height:20px;" colspan="6"></th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">库存数量（吨）：<span style="color: red;">*</span></label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="inventoryQuantity" ng-model="productEdit.inventoryQuantity"
-															   required/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">液位高度（m）：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="liquidLevel" ng-model="productEdit.liquidLevel"/>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">记录日期：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="recordDateYG" ng-model="productEdit.recordDate"
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})"/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">记录人：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
-													</label>
-												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">审核人：</label>
-												</th>
-												<th width='15%'>
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
-													</label>
-												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">其他：</label>
-												</th>
-												<th colspan="5">
-													<label class="input">
-														<i class="input"></i>
-														<input type="text" name="others" ng-model="productEdit.others"/>
-													</label>
-												</th>
-											</tr>
-										</table>
-									</table>
-								</fieldset>
-
-								<footer class="text-align-center">
-									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-									<button type="button" ng-hide="disabled" class="btn btn-primary" ng-click="saveData()">保存</button>
-								</footer>
-							</form>
-						</div>
-					</div>
-				</div>
-			</article>
-		</div>
-	</section>
-</div>