各种修改

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

@@ -55,9 +55,9 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     				planService.getjybjl($rootScope.userInfo.orgId).then(function(datas){
     					if(datas==0){ //返回的是数量
     						$scope.isNotEdit = true;
-   						 //确认框
-   						 var showConfim=document.getElementById("confim");
-   			             showConfim.style.display="block";
+   						    //确认框
+   						    var showConfim=document.getElementById("confim");
+   			                showConfim.style.display="block";
     					}
     		        },function(datas){
     		            console.log(datas);

src/main/resources/static/app/home/controller/quxtCtrl.js

@@ -30,16 +30,25 @@ angular.module('app.system').controller("quxtCtrl",
         // 五温检查列表
         $scope.loadThreeTemperature= function() {
             //查询三温检查列表最新数据所对应的仓房
-        	StorehouseService.getThreeTempCheckList($rootScope.orgInfo.orgId).then(function(data){
-                if((data.houseList).length>0){
-                	$scope.houseId = data.houseList[0].storehouseId;
-                }else{
-            		$scope.houseId = "";
-            	}
-                $scope.newInit();
-            },function (data) {
-                console.log(data);
+        	StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(datae){
+                if((datae.houseList).length>0){
+                    $scope.storehouseList = datae.houseList;  //下拉列表数据
+                    $scope.storehouseCode = datae.houseList[0].storehouseCode;
+                    $scope.newInit();
+                }
+            },function (datae) {
+                console.log(datae);
             });
+//        	StorehouseService.getThreeTempCheckList($rootScope.orgInfo.orgId).then(function(datas){
+//        		if (datas.houseList != null) {
+//        			$scope.houseId = datas.houseList[0].storehouseId;
+//        			$scope.newInit();
+//        		} else {
+//        			
+//            	}
+//            },function (datas) {
+//                console.log(datas);
+//            });
 
         }
 
@@ -47,7 +56,7 @@ angular.module('app.system').controller("quxtCtrl",
 
 
         $scope.newInit = function () {
-            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$rootScope.storehouseObj[parseInt($scope.houseId)].storehouseCode,"7").then(function(data){
+            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$scope.storehouseCode,"7").then(function(data){
                 //初始化echarts 图表
                 var option = {
                     tooltip : {
@@ -219,15 +228,15 @@ angular.module('app.system').controller("quxtCtrl",
                     $("#quxt").prepend($compile(sele)($scope)); 
                     //查询仓房下拉菜单
 
-                    StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(data){
-                        if((data.houseList).length>0){
-                            $scope.storehouseList = data.houseList;  //下拉列表数据
+                    StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(dataes){
+                        if((dataes.houseList).length>0){
+                            $scope.storehouseList = dataes.houseList;  //下拉列表数据
                             if($scope.houseId == ""){
-                            	$scope.houseId = data.houseList[0].storehouseId;
+                            	$scope.storehouseCode = dataes.houseList[0].storehouseCode;
                             }
                         }
-                    },function (data) {
-                        console.log(data);
+                    },function (dataes) {
+                        console.log(dataes);
                     });
 
                 }

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -285,7 +285,8 @@ angular.module('app.storage')
                 $scope.qualitycheck.houseId = data.qualitycheck.houseId.toString();
                 $scope.qualitycheck.wareHouseName = data.wareHouseName;//用于验收，春秋的回显
                 $scope.qualitycheck.inspectionStandardBasis = parseInt($scope.qualitycheck.inspectionStandardBasis);
-                $scope.qualitycheck.inputTime = $filter('date')($scope.qualitycheck.inputTime, "yyyy-MM-dd");
+                $scope.qualitycheck.inputTime = $scope.qualitycheck.inputTime.substr(0,10);
+                $scope.qualitycheck.zhycsj = $scope.qualitycheck.zhycsj.substr(0,10);
                 $scope.qualitycheck.chooseTime = $filter('date')($scope.qualitycheck.chooseTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.qualitycheck.checkTime = $filter('date')($scope.qualitycheck.checkTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.qualitycheck.applyCheckTime = $filter('date')($scope.qualitycheck.applyCheckTime, "yyyy-MM-dd");
@@ -297,7 +298,7 @@ angular.module('app.storage')
                 $scope.qualitycheck.checkResultTime = $filter('date')($scope.qualitycheck.checkResultTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.qualitycheck.qfrq = $filter('date')($scope.qualitycheck.qfrq, "yyyy-MM-dd");//签发日期
                 $scope.change(0);//点击仓房切换货位
-                if ($stateParams.isNotEdit == "false") {
+                if ($scope.qualitycheck.id == null) {
                     $scope.qualitycheck.checker = $rootScope.userInfo.realName; //检验人，只有在新增和修改的时候才展示为当前登录人
                 }
                 if($stateParams.depotType == "1"){
@@ -614,7 +615,8 @@ angular.module('app.storage')
                             $scope.qualitycheck.subTypeDetailed = parseInt($scope.keepaccount.mxpz);//明细品种
                             $scope.qualitycheck.numberUpdate = $scope.keepaccount.kcsl;//数量
                             $scope.qualitycheck.harvestTime = parseInt($scope.keepaccount.scnf);//收货年度
-                            $scope.qualitycheck.inputTime = $filter('date')($scope.keepaccount.rq, "yyyy-MM-dd");//入仓时间
+                            $scope.qualitycheck.inputTime = $scope.keepaccount.cjsj.substr(0,10);//入仓时间
+                            $scope.qualitycheck.zhycsj = $scope.keepaccount.rq.substr(0,10);//入仓时间
                             // $scope.qualitycheck.checkTime = getNowFormatDate(); //检验日期
                             $scope.qualitycheck.quality = $scope.keepaccount.hwxz; //货位性质 (储粮性质)主要用于封仓管理中验证某个性质
                             $scope.qualitycheck.location = parseInt($scope.keepaccount.gb); //产地
@@ -664,7 +666,8 @@ angular.module('app.storage')
                             		}
                             	}
                             }
-                            $scope.qualitycheck.inputTime = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd");//入仓时间
+                            $scope.qualitycheck.inputTime = $scope.qualityFinishedCard.rksj.substr(0,10);//入仓时间
+                            $scope.qualitycheck.zhycsj = $scope.qualityFinishedCard.zhycsj.substr(0,10);//入库时间
                             // $scope.qualitycheck.checkTime = getNowFormatDate(); //检验日期
                             $scope.qualitycheck.quality = $scope.qualityFinishedCard.lyxz; //货位性质 (储粮性质)主要用于封仓管理中验证某个性质
                             $scope.qualitycheck.location = parseInt($scope.qualityFinishedCard.lycd); //产地
@@ -753,11 +756,11 @@ angular.module('app.storage')
         	var pz = $scope.qualitycheck.subType;
         	if (pz=="3164") {
         		var sf = parseFloat($scope.qualitycheck.water);//水分
-        		$scope.qualitycheck.water = $scope.getMath(sf);
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
         		var rz = parseFloat($scope.qualitycheckInspection.unitWeight);//容重
-        		$scope.qualitycheckInspection.unitWeight = $scope.getMath(rz);
+        		$scope.qualitycheckInspection.unitWeight = $scope.getMath1(rz);
         		var xmydzs = parseFloat($scope.qualitycheck.hardIndex);//小麦硬度指数
-        		$scope.qualitycheck.hardIndex = $scope.getMath(xmydzs);
+        		$scope.qualitycheck.hardIndex = $scope.getMath1(xmydzs);
         		var mineral = parseFloat($scope.qualitycheck.mineral);//矿物质
         		//mineral = isNaN(mineral) ? 0.00 : mineral;
         		$scope.qualitycheck.mineral = $scope.getMath(mineral);
@@ -794,6 +797,8 @@ angular.module('app.storage')
         		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
         		//bblzl = isNaN(bblzl) ? 0 : bblzl;
         		//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
+        		var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量
         			var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
@@ -810,13 +815,13 @@ angular.module('app.storage')
         		}
         	} else if (pz=="3166") {
         		var sf = parseFloat($scope.qualitycheck.water);//水分
-        		$scope.qualitycheck.water = $scope.getMath(sf);
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
         		var ccl = parseFloat($scope.qualitycheck.huskedRation);//出糙率
-        		$scope.qualitycheck.huskedRation = $scope.getMath(ccl);
+        		$scope.qualitycheck.huskedRation = $scope.getMath1(ccl);
         		var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
         		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
         		var zjml = parseFloat($scope.qualitycheck.fullGoodRation);//整精米率
-        		$scope.qualitycheck.fullGoodRation = $scope.getMath(zjml);
+        		$scope.qualitycheck.fullGoodRation = $scope.getMath1(zjml);
         		var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
         		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
         		var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
@@ -832,15 +837,15 @@ angular.module('app.storage')
         		var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
         		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
         		var gwcm = parseFloat($scope.qualitycheck.outHuskedRation);//谷外糙米
-        		$scope.qualitycheck.outHuskedRation = $scope.getMath(gwcm);
+        		$scope.qualitycheck.outHuskedRation = $scope.getMath1(gwcm);
         		var cml = parseFloat($scope.qualitycheckInspection.riceYield);//出米率
-        		$scope.qualitycheckInspection.riceYield = $scope.getMath(cml);
-        		var hlm = parseFloat($scope.qualitycheck.yellowPart);//黄粒米
-        		$scope.qualitycheck.yellowPart = $scope.getMath(hlm);
+        		$scope.qualitycheckInspection.riceYield = $scope.getMath1(cml);
+        		var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
+        		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
         		var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
-        		$scope.qualitycheck.intermixingRate = $scope.getMath(hhl);
+        		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
         		var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
-        		$scope.qualitycheckInspection.inputTwo = $scope.getMath(zdy);
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
@@ -910,6 +915,12 @@ angular.module('app.storage')
                         $scope.qualitycheck.inputTime = $filter('date')(item.value, "yyyy-MM-dd");
                     }
                 });
+                //入库日期
+                $("input[name='zhycsj']").each(function(j,item){
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                        $scope.qualitycheck.zhycsj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
+                    }
+                });
                 //扦样日期
                 $("input[name='chooseTime']").each(function(j,item){
                     if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
@@ -932,7 +943,7 @@ angular.module('app.storage')
                 }
 
                 if (qysj!= "" && jysj!= "" && qysj > jysj) {
-                    alert( "扦样日期应该早于检验日期！");
+                    alert( "扦样时间应该早于检验时间！");
                     return false;
                 }
 

src/main/resources/static/app/storage/grainCard/controller/checkFoodSituationListCtrl.js

@@ -20,6 +20,7 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                     } else {
                         $scope.GrainCardByIdObj.grainRights = $rootScope.orgInfo.orgName;
                     }
+                    $scope.GrainCardByIdObj.wall = $rootScope.storehouseObj[$scope.GrainCardByIdObj.storehouseId].wall;
                 } else {
                     $scope.GrainCardByIdObj = {};
                 }
@@ -47,11 +48,10 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                     }
 
                     $scope.grainCardView.inputTime = $filter('date')($scope.grainCardView.inputTime, "yyyy-MM-dd");
+                    $scope.grainCardView.zhycsj = $filter('date')($scope.grainCardView.zhycsj, "yyyy-MM-dd");
                     $scope.grainCardView.checkTime = $filter('date')($scope.grainCardView.checkTime, "yyyy-MM-dd");
                     $scope.grainCardView.useDate = $filter('date')($scope.grainCardView.useDate, "yyyy-MM-dd");
-
-                    //一次倒仓保留以前数据
-                    $scope.grainCardView.inputTime = $filter('date')($scope.grainCardView.inputTime, "yyyy-MM-dd");
+                    $scope.grainCardView.useDate = $scope.grainCardView.useDate.substr(0,4);
 
                     //小麦及混合小麦111 ，玉米112，大豆141，稻谷113  市平台
                     //小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166

src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js

@@ -8,7 +8,8 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
         grainCardService.findGrainCardById(id).then(function (data) {
             $scope.grainCard = data.data;
             // 建卡日期格式化回显
-            $scope.grainCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd");
+            $scope.grainCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd HH:mm:ss");
+            $scope.findQualityCheck($scope.grainCard.storehouseId, $scope.grainCard.warehouseId);
         }, function (data) {
             console.log(data);
         });
@@ -33,6 +34,8 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
                 $scope.grainCard.rksl = data.data.number_update === null ? '' : (data.data.number_update/1000).toFixed(3);
                 $scope.grainCard.grainVarietyNum = data.data.enumcode === null ? '' : data.data.enumcode;
                 $scope.grainCard.grainVarietyName = data.data.enumname === null ? '' : data.data.enumname;
+                $scope.rcsj = $filter('date')(data.data.input_time, "yyyy-MM-dd");
+                $scope.rksj = data.data.zhycsj.substr(0,10);
             }
         }, function (data) {
             console.log(data);
@@ -42,7 +45,7 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
     // 判断新增或修改
     if ($stateParams.id === '') { // 新增保存
         $scope.isNotEdit = false; // 可编辑
-        $scope.grainCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd");// 建卡日期
+        $scope.grainCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 建卡日期
     } else { // 修改保存
         $scope.isNotEdit = true; // 不可编辑
         $scope.findOilGrainCardById($stateParams.id);
@@ -62,6 +65,13 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
             $scope.grainCard.flagType = '1'; // 通过编号默认初始为1(保存:1,提交:2, 借用通过编号 区分手动补录,和推送数据)
             // 保存获取时间插件值
             $scope.grainCard.acceptDate = $("input[name='acceptDate']").val();
+            var rksj = new Date($scope.rksj.replace( /\-/g, "\/"));
+            var jksj = $scope.grainCard.acceptDate.substr(0,10);
+            jksj = new Date(jksj.replace( /\-/g, "\/"));
+            if (rksj!= "" && jksj!= "" && rksj > jksj) {
+                alert( "建卡时间不能晚于入库时间！");
+                return false;
+            }
             // 验收类型名
             if ($scope.grainCard.checkTypeNum === '0') { // 入库验收
                 $scope.grainCard.checkTypeName = '入库验收';

src/main/resources/static/app/storage/grainCard/controller/oilCarAddCtrl.js

@@ -8,8 +8,8 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
         grainCardService.findGrainCardById(id).then(function (data) {
             $scope.oilCard = data.data;
             // 建卡日期格式化回显
-            $scope.oilCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd");
-            $scope.findQualityCheckScnd($stateParams.storehouseId);
+            $scope.oilCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd HH:mm:ss");
+            $scope.findQualityCheck($scope.oilCard.storehouseId);
         }, function (data) {
             console.log(data);
         });
@@ -24,6 +24,8 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
                 $scope.oilCard.rksl = data.data.number_update === null ? '' : (data.data.number_update/1000).toFixed(3);
                 $scope.oilCard.grainVarietyNum = data.data.enumcode === null ? '' : data.data.enumcode;
                 $scope.oilCard.grainVarietyName = data.data.enumname === null ? '' : data.data.enumname;
+                $scope.rcsj = $filter('date')(data.data.input_time, "yyyy-MM-dd");
+                $scope.rksj = data.data.zhycsj.substr(0,10);
             }
         }, function (data) {
             console.log(data);
@@ -33,7 +35,7 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
     // 判断新增或修改
     if ($stateParams.id === '') { // 新增保存
         $scope.isNotEdit = false; // 可编辑
-        $scope.oilCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd");// 建卡日期
+        $scope.oilCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 建卡日期
     } else { // 修改保存
         $scope.isNotEdit = true; // 不可编辑
         $scope.findOilGrainCardById($stateParams.id);
@@ -49,6 +51,13 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
             $scope.oilCard.tgph = '1'; // 通过编号(保存:1,提交:2, 借用通过编号 区分手动补录,和推送数据)
             // 保存获取时间插件值
             $scope.oilCard.acceptDate = $("input[name='acceptDate']").val();
+            var rksj = new Date($scope.rksj.replace( /\-/g, "\/"));
+            var jksj = $scope.oilCard.acceptDate.substr(0,10);
+            jksj = new Date(jksj.replace( /\-/g, "\/"));
+            if (rksj!= "" && jksj!= "" && rksj > jksj) {
+                alert( "建卡时间不能晚于入库时间！");
+                return false;
+            }
             // 验收类型名
             if ($scope.oilCard.checkTypeNum === '0') { // 入库验收
                 $scope.oilCard.checkTypeName = '入库验收';

src/main/resources/static/app/storage/grainCard/controller/productGrainAddCtrl.js

@@ -8,7 +8,7 @@ angular.module('app.storage').controller("productGrainAddCtrl",
         $scope.grainOrOil = false; // 默认显示仓房信息
 
         // 初始化建卡日期
-        $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd");
+        $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
 
         // 保存或修改
         $scope.loadDataById = function (id) {
@@ -24,9 +24,10 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                 $scope.cerealsCard.ccfsCode = parseInt(data.data.ccfsCode);
                 $scope.cerealsCard.lydjCode = parseInt(data.data.lydjCode);
                 // 时间格式化
-                $scope.cerealsCard.rksj = $filter('date')(data.data.rksj, "yyyy-MM-dd");
+                $scope.cerealsCard.rksj = $filter('date')(data.data.rksj, "yyyy-MM-dd HH:mm:ss");
+                $scope.cerealsCard.zhycsj = $filter('date')(data.data.zhycsj, "yyyy-MM-dd HH:mm:ss");
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
-                $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd");
+                $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd HH:mm:ss");
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
                 $scope.getAreaData(); // 树形下拉产地
                 $scope.getsGrainDetailKind(); //树形下拉明细品种
@@ -34,6 +35,22 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                 console.log(data);
             });
         };
+        
+        $scope.getMath = function(v) {
+            if (isNaN(v) || v == "") {
+                v = 0.00;
+            } else {
+                v = Math.round(v*100)/100;
+                v = v.toString();
+                var rs = v.indexOf('.');
+                if(rs < 0){
+                    v = v + ".00";
+                }else{
+                    while(v.length <= rs + 2){v += '0';}
+                }
+            }
+            return v;
+        }
 
         // 获取仓房基础信息
         $scope.findStorehouse = function (houseId) {
@@ -69,10 +86,20 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                     $scope.cerealsCard.wallCode = data.house; // 仓房结构编码
                     $scope.cerealsCard.wallName = $rootScope.dicData[data.house]; // 仓房结构名称
                     $scope.cerealsCard.outsideHeigth = data.storeOutsideHeigth; // 外檐高度(m)
-                    $scope.cerealsCard.inLength = data.length; // 仓内长
-                    $scope.cerealsCard.inWidth = data.width; // 仓内宽
+                    if(data.storehouseType == "2972" || data.storehouseType == "2973"){//仓房类型为圆筒仓和浅圆仓
+                    	$scope.cerealsCard.inLength = data.siloDiameter; // 仓内长(筒仓内劲)
+                        $scope.cerealsCard.inWidth = null; // 仓内宽
+                        var cnc = parseFloat($scope.cerealsCard.siloDiameter == null ? 1 : $scope.cerealsCard.siloDiameter);
+                        //var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
+                        $scope.cerealsCard.binVolume = $scope.getMath(3.14*(cnc/2)*(cnc/2));// 使用面积
+                    } else {
+                    	$scope.cerealsCard.inLength = data.length; // 仓内长
+                        $scope.cerealsCard.inWidth = data.width; // 仓内宽
+                        var cnc = parseFloat($scope.cerealsCard.inLength == null ? 1 : $scope.cerealsCard.inLength);
+                        var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
+                        $scope.cerealsCard.binVolume = $scope.getMath(cnc*cnk);// 使用面积
+                    }
                     $scope.cerealsCard.grainLineHeigth = data.grainLineHeigth; // 设计装粮线高度高度
-                    $scope.cerealsCard.binVolume = data.binVolume; // 使用面积
                     $scope.cerealsCard.spareFour = '0'; // 0仓房,1油罐
                 }
             }, function (data) {
@@ -136,7 +163,8 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                     $scope.cerealsCard.lypzName = $rootScope.dicData[datas.list[0].lypz];
                     $scope.cerealsCard.spareThree = parseInt($scope.qualityFinishedCard.mxpz);//明细品种
                     $scope.cerealsCard.lydjCode = datas.list[0].lydj; //等级
-                    $scope.cerealsCard.rksj = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd");//入库时间
+                    $scope.cerealsCard.rksj = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd HH:mm:ss");//入仓时间
+                    $scope.cerealsCard.zhycsj = $filter('date')($scope.qualityFinishedCard.zhycsj, "yyyy-MM-dd HH:mm:ss");//入库时间
                     $scope.cerealsCard.lycdCode = parseInt($scope.qualityFinishedCard.lycd);//产地
                     $scope.cerealsCard.lysl = $scope.qualityFinishedCard.kcsl;//数量
                     
@@ -219,8 +247,15 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                 }
                 // 保存获取时间插件值
                 $scope.cerealsCard.rksj = $("input[name='rksj']").val();
+                $scope.cerealsCard.zhycsj = $("input[name='zhycsj']").val();
                 $scope.cerealsCard.scrq = $("input[name='scrq']").val();
                 $scope.cerealsCard.jkrq = $("input[name='jkrq']").val();
+                var rcsj = new Date($scope.cerealsCard.rksj.replace( /\-/g, "\/"));
+                var jksj = new Date($scope.cerealsCard.jkrq.replace( /\-/g, "\/"));
+                if (rcsj!= "" && jksj!= "" && rcsj > jksj) {
+                    alert( "入仓时间应该早于建卡时间！");
+                    return false;
+                }
 
                 // 储存方式名称
                 // $scope.cerealsCard.ccfsName = $rootScope.dicData[$scope.cerealsCard.ccfsCode];

src/main/resources/static/app/storage/grainCard/controller/productGrainCheckCtrl.js

@@ -7,6 +7,7 @@ angular.module('app.storage').controller("productGrainCheckCtrl",
         $scope.loadDataById = function () {
             cerealsCardService.findDataById($stateParams.id).then(function (data) {
                 $scope.cerealsCard = data.data;
+                $scope.cerealsCard.wallName = $rootScope.dicData[$rootScope.storehouseObj[$scope.cerealsCard.spareOne].wall];
                 // 判断是粮食信息还是油信息(0仓房,1油罐)
                 if ($scope.cerealsCard.spareFour === '1') { // 1油罐
                     $scope.grainOrOil = true;

src/main/resources/static/app/storage/grainCard/views/addQualityInspection.html

@@ -487,7 +487,7 @@
                                                 <td class="text-center">{{quailckCard.mildewCount}}</td>
                                                 <td class="text-center">{{quailckCard.outHuskedRation}}</td>
                                                 <td class="text-center">{{quailckCard.intermixingRate}}</td>
-                                                <td class="text-center">{{quailckCard.qualitycheckInspection.yellowPart}}</td>
+                                                <td class="text-center">{{quailckCard.qualitycheckInspection.yellowRice}}</td>
                                                 <td class="text-center">{{quailckCard.colorsmell}}</td>
                                                 <td class="text-center" colspan="3" style="word-break: break-all">{{quailckCard.checker}}</td>
                                                 <td class="text-center" colspan="2" style="vertical-align: middle;">

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -93,7 +93,7 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐容量（吨）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.tankCapacity}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓日期(第一车)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">水分及挥发物含量%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.waterVolatiles}}</td>
@@ -101,32 +101,32 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">直径（米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.diameter}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库日期(最后一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">不溶性杂质含量%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">高度（米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.height}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">酸价（KOH）/(mg/g)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">底面积（平方米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.bottomArea}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">过氧化值(mmol/kg)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.peroxideValue}}</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计储油高度（米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designHeight}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.checkTime}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
                                                 <td class="text-center" colspan="2"
@@ -134,10 +134,10 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">状态</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">货位状态</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡时间</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">计价数量</td>
@@ -146,8 +146,8 @@
                                             <tr>
                                                 "<td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
@@ -156,12 +156,12 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">出油口高度（米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.oilHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">检查口高度（米）</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.insportHeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
                                             </tr>
 
                                             <tr>
@@ -284,7 +284,7 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年份</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.useDate}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓日期(第一车)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -308,9 +308,9 @@
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.house]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[GrainCardByIdObj.wall]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -335,8 +335,8 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">外檐高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeOutsideHeigth}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -362,8 +362,8 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内长(直径)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.length}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -384,15 +384,15 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
                                                     {{grainCardView.outHuskedRation}}
                                                 </td>
-                                                <td class="text-center" rowspan="3" colspan="2"
+                                                <td class="text-center" rowspan="2" colspan="2"
                                                     style="vertical-align: middle;border:1px solid #ccc;vertical-align: middle;text-align: center;">{{grainCardView.keeperNames}}
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate | date:'yyyy-MM-dd'}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
                                                 
                                                 <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
 
@@ -415,6 +415,8 @@
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计装粮线高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainLineHeigth}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡时间</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">储存方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.keepingWay]}}</td>
                                                 
@@ -432,7 +434,7 @@
                                                 </td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">黄粒米%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.yellowPart}}
+                                                    {{grainCardView.qualitycheckInspection.yellowRice}}
                                                 </td>
                                             </tr>
                                             <tr>
@@ -965,7 +967,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.mildewCount}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.outHuskedRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.intermixingRate}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.yellowPart}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.yellowRice}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.colorsmell}}</td>
                                                 <td class="text-center" colspan="3" style="word-break: break-all;vertical-align: middle;text-align: center;">{{quailckCard.checker}}</td>
                                                 <td class="text-center" colspan="2" style="vertical-align: middle;vertical-align: middle;text-align: center;">

src/main/resources/static/app/storage/grainCard/views/foodSituationList.html

@@ -73,7 +73,7 @@
 											<th data-class="expand" class="text-center">货位名称</th>
 											<th data-hide="expand" class="text-center">粮油品种</th>
 <!--											<th data-hide="expand" class="text-center">验收数量(吨)</th>-->
-											<th data-hide="expand" class="text-center">验收日期</th>
+											<th data-hide="expand" class="text-center">建卡日期</th>
 											<th data-hide="expand" class="text-center">验收类型</th>
 											<th data-hide="expand" class="text-center">操作</th>
 										</tr>
@@ -86,7 +86,7 @@
 											<td class="text-center">{{ gainCard.warehouseName }}</td>
 											<td class="text-center">{{ gainCard.grainVarietyName }}</td>
 <!--											<td class="text-center">{{ gainCard.rksl | number : 3}}</td>-->
-											<td class="text-center">{{ gainCard.acceptDate | date:'yyyy/MM/dd' }}</td>
+											<td class="text-center">{{ gainCard.acceptDate | date:'yyyy-MM-dd'}}</td>
 											<td class="text-center">{{ gainCard.checkTypeName }}</td>
 											<!-- 使用通过编号效验是否为补录数据,在保存数据时手动补录数据通过编号与提交保存标记同步 -->
 											<td class="text-center">

src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -72,14 +72,14 @@
                                         </tr>
                                         <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期:<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间:<span style="color: red;">*</span></label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="grainCard.acceptDate"
                                                                name="acceptDate" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
                                                     </label>
                                                 </section>
                                             </th>
@@ -99,7 +99,7 @@
                                                 </section>
                                             </th>
                                             <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨):</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨):</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -114,6 +114,30 @@
 
                                         <tr>
                                             <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓日期(第一车):<span style="color: red;">*</span></label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="rcsj"
+                                                               name="rcsj" class="form-control Wdate"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库日期(最后一车):<span style="color: red;">*</span></label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="rksj"
+                                                               name="rksj" class="form-control Wdate"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
                                             </th>
                                             <th>
@@ -124,6 +148,8 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
                                             </th>
@@ -149,10 +175,6 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-
-                                        
-                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
                                             </th>
@@ -164,7 +186,9 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th>
+                                        </tr>
+                                        <tr>
+                                        	<th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
@@ -192,6 +216,8 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                            <th></th>
+                                            <th></th>
                                         </tr>
                                         <tr>
                                             <th>

src/main/resources/static/app/storage/grainCard/views/oilCarAdd.html

@@ -54,14 +54,14 @@
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间<span style="color: red;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="oilCard.acceptDate"
                                                                name="acceptDate" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
                                                     </label>
                                                 </section>
                                             </th>
@@ -83,7 +83,7 @@
                                                 </section>
                                             </th>
                                             <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -107,6 +107,30 @@
                                         </tr>
                                         <tr>
                                             <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓日期(第一车):<span style="color: red;">*</span></label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="rcsj"
+                                                               name="rcsj" class="form-control Wdate"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库日期(最后一车):<span style="color: red;">*</span></label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="rksj"
+                                                               name="rksj" class="form-control Wdate"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
                                             </th>
                                             <th>
@@ -117,6 +141,8 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
                                             </th>
@@ -142,8 +168,6 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
                                             </th>
@@ -155,6 +179,9 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                            <!-- <th colspan="4"></th> -->
+                                        </tr>
+                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
                                             </th>
@@ -172,13 +199,10 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                            <!-- <th colspan="4"></th> -->
-                                        </tr>
-                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
                                             </th>
-                                            <th style="border-bottom-width:1px" colspan="5">
+                                            <th style="border-bottom-width:1px" colspan="3">
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="oilCard.remark"

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

@@ -92,14 +92,26 @@
                                         <!--第二个tr开始 -->
                                         <tr>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="cerealsCard.rksj"
                                                                name="rksj" class="form-control Wdate" ng-readonly="true"
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th width='10%'>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间(最后一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                            </th>
+                                            <th width='20%'>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="cerealsCard.zhycsj"
+                                                               name="zhycsj" class="form-control Wdate" ng-readonly="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
                                                     </label>
                                                 </section>
                                             </th>
@@ -115,6 +127,10 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <!--第二个tr结束 -->
+                                        <!--第三个tr开始 -->
+                                        <tr>
                                             <th style="border-bottom-width:1px">
                                                 <label class="label" style="margin-top: 9px;text-align: center;">产地</label>
                                             </th>
@@ -134,10 +150,6 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-                                        <!--第二个tr结束 -->
-                                        <!--第三个tr开始 -->
-                                        <tr>
                                             <th style="border-bottom-width:1px">
                                                 <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
@@ -160,6 +172,9 @@
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <!--第三个tr结束 -->
+                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">包装规格</label>
                                             </th>
@@ -171,17 +186,14 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-                                        <!--第三个tr结束 -->
-                                        <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">品牌</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">品牌(厂家)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
                                                         <input class="form-control" type="text" ng-model="cerealsCard.pinp"
-                                                               name="pinp">
+                                                               name="pinp" required />
                                                     </label>
                                                 </section>
                                             </th>
@@ -193,7 +205,7 @@
                                                     <label class="select">
                                                         <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
                                                             <option value="">--请选择--</option>
-                                                            <option value="分件">分件</option>
+                                                            <option value="包装垛存">包装垛存</option>
                                                             <option value="油罐">油罐</option>
                                                         </select><i></i>
                                                         <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"
@@ -203,17 +215,23 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期</label>
+                                        </tr>
+                                        <tr>
+                                        	<th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间</label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
                                                         <input class="form-control Wdate" type="text" ng-model="cerealsCard.jkrq"
-                                                               name="jkrq" onClick="WdatePicker({lang:'zh-cn'})">
+                                                               name="jkrq" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                                     </label>
                                                 </section>
                                             </th>
+                                            <th></th>
+                                            <th></th>
+                                            <th></th>
+                                            <th></th>
                                         </tr>
                                     </table>
                                     <div>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-G.html

@@ -28,42 +28,43 @@
     <tr>
         <td style="vertical-align: middle;text-align: center;" height="56px">仓房类型</td>
         <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.storehouseType]}}</td>
-        <td style="vertical-align: middle;text-align: center;">入库时间</td>
+        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;" height="56px">入库时间(最后一车)</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">建设年份</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.buildDate}}</td>
-        <td style="vertical-align: middle;text-align: center;">生产日期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;">生产日期</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">仓房结构</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.wallName}}</td>
-
-        <td style="vertical-align: middle;text-align: center;">产地</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;">产地</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">外檐高度</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.outsideHeigth}}</td>
-        <td style="vertical-align: middle;text-align: center;">数量</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;">数量</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">仓内长(直径)</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inLength}}</td>
-        <td style="vertical-align: middle;text-align: center;">件数</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
-        <td rowspan="3" colspan="2" style="vertical-align: middle;text-align: center">{{cerealsCard.storemanName}}</td>
+        <td rowspan="2" colspan="2" style="vertical-align: middle;text-align: center">{{cerealsCard.storemanName}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;">包数</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">仓内宽</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inWidth}}</td>
-        <td style="vertical-align: middle;text-align: center;">包装规格</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
     </tr>
     <tr>
+        <td style="vertical-align: middle;text-align: center;">包装规格</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
         <td style="vertical-align: middle;text-align: center;" height="56px">设计装粮线高度</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.grainLineHeigth}}</td>
         <td style="vertical-align: middle;text-align: center;">品牌</td>

src/main/resources/static/app/storage/grainCard/views/productGrainList.html

@@ -59,7 +59,7 @@
                                         <th data-class="expand" class="text-center">货位名称</th>
                                         <th data-hide="expand" class="text-center">粮油品种</th>
                                         <th data-hide="expand" class="text-center">数量(吨)</th>
-                                        <th data-hide="expand" class="text-center">建卡日期</th>
+                                        <th data-hide="expand" class="text-center">建卡时间</th>
                                         <th data-hide="expand" class="text-center">操作</th>
                                     </tr>
                                     </thead>
@@ -71,7 +71,7 @@
                                         <td class="text-center">{{cereals.warehouseName}}</td>
                                         <td class="text-center">{{cereals.lypzName}}</td>
                                         <td class="text-center">{{cereals.lysl}}</td>
-                                        <td class="text-center">{{cereals.jkrq | date:'yyyy/MM/dd'}}</td>
+                                        <td class="text-center">{{cereals.jkrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                         <td class="text-center">
                                             <a href-void ng-click="checkProductGrainList(cereals.id,cereals.spareFour)">查看</a>
                                             <a ng-hide="isArchive" href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>

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

@@ -134,6 +134,14 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 
 			$("#product-form input").attr("disabled",$scope.disabled );
 			$("#product-form select").attr("disabled",$scope.disabled );
+			
+			if ($scope.productEdit.zylx=="0") {
+				$scope.rkzy = true;
+				$scope.ckzy = false;
+			} else if ($scope.productEdit.zylx=="1") {
+				$scope.rkzy = false;
+				$scope.ckzy = true;
+			}
 		},function(data){
 			console.log();
 		});
@@ -263,6 +271,16 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 			console.log(data);
 		});
 	};
+	
+	$scope.restZyData = function(zylx) {
+		if (zylx == "0") {
+			$scope.productEdit.ckjs = null;
+			$scope.productEdit.outboundQuantity = null;
+		} else if (zylx == "1") {
+			$scope.productEdit.rkjs = null;
+			$scope.productEdit.storageQuantity = null;
+		} 
+	}
 
 	// 计算库存数量
 	$scope.calculate = function() {
@@ -272,19 +290,19 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 		nums = parseFloat(nums);
 		$scope.productEdit.specifications = nums;
 
-        if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== "") {//入库数量不为空的情况
+        if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== "" && $scope.productEdit.storageQuantity != null) {//入库数量不为空的情况
             //把出库件数、出库数量设置为空，并且不可编辑
-            $scope.productEdit.ckjs = "";
-			$scope.productEdit.outboundQuantity = "";
+            $scope.productEdit.ckjs = null;
+			$scope.productEdit.outboundQuantity = null;
 			$scope.ckjs = true;
 			$scope.cksl = true;
 			//入库数量和入库设置为可编辑
 			$scope.rkjs = false;
 			$scope.rksl = false;
-        } else if($scope.productEdit.outboundQuantity !== undefined && $scope.productEdit.outboundQuantity !== "") {//出库数量不为空的情况
+        } else if($scope.productEdit.outboundQuantity !== undefined && $scope.productEdit.outboundQuantity !== "" && $scope.productEdit.outboundQuantity != null) {//出库数量不为空的情况
             //把入库件数、入库数量设置为空，并且不可编辑
-			$scope.productEdit.rkjs = "";
-			$scope.productEdit.storageQuantity = "";
+			$scope.productEdit.rkjs = null;
+			$scope.productEdit.storageQuantity = null;
 			$scope.rkjs = true;
 			$scope.rksl = true;
 			//出库数量和出库件数设置为可编辑

src/main/resources/static/app/storage/product/service/productService.js

@@ -11,8 +11,10 @@ angular.module('app.storage').service("productService", function($http, $q, $roo
 				pageNum : pageNum,
 				pageSize : pageSize,
 				houseId : search == undefined?"":search.houseId,
+				wareId : search == undefined?"":search.wareId,
 				searchStartDate : search == undefined?"":search.searchStartDate,
-				searchEndDate : search == undefined?"":search.searchEndDate
+				searchEndDate : search == undefined?"":search.searchEndDate,
+				orgId : $rootScope.orgInfo.orgId
 			}
 		}).then(function successCallback(response) {
 			// 请求成功执行代码

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

@@ -69,10 +69,12 @@
 											<th data-class="expand" style="text-align:center;">仓房/油罐名称</th>
 											<th data-class="expand" style="text-align:center;">货位名称</th>
 											<th data-class="expand" style="text-align:center;">粮油品种</th>
+											<th data-class="expand" style="text-align:center;">明细品种</th>
 											<th data-class="expand" style="text-align:center;">粮油性质</th>
 											<th data-class="expand" style="text-align:center;">粮油等级</th>
 <!-- 											<th data-class="expand" style="text-align:center;">生产年月</th> -->
-											<th data-class="expand" style="text-align:center;">入库日期</th>
+											<th data-class="expand" style="text-align:center;">入仓日期(第一车)</th>
+											<th data-class="expand" style="text-align:center;">入库日期(最后一车)</th>
 											<th data-class="expand" style="text-align:center;">库存数量（吨）</th>
 											<th data-class="expand" style="text-align:center;">最新核对时间</th>
 										</tr>
@@ -84,10 +86,12 @@
 											<td style="text-align:center;">{{storehouseObj[product.houseId].storehouseName}}</td>
 											<td style="text-align:center;">{{warehouseObj[product.warehouseId].warehouseName}}</td>
 											<td style="text-align:center;">{{dicData[product.lypz]}}</td>
+											<td style="text-align:center;">{{dicData[product.mxpz]}}</td>
 											<td style="text-align:center;">{{dicData[product.lyxz]}}</td>
 											<td style="text-align:center;">{{dicData[product.lydj]}}</td>
 <!-- 											<td style="text-align:center;">{{product.scny | date:'yyyy-MM'}}</td> -->
-											<td style="text-align:center;">{{product.rksj | date:'yyyy-MM-dd'}}</td>
+											<td style="text-align:center;">{{product.rksj | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+											<td style="text-align:center;">{{product.zhycsj | date:'yyyy-MM-dd HH:mm:ss'}}</td>
 											<td style="text-align:center;">{{product.kcsl | number : 3}}</td>
 											<td style="text-align:center;">{{product.hdsj | date:'yyyy-MM-dd HH:mm:ss'}}</td>
 										</tr>

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

@@ -187,12 +187,40 @@
 													<label class="select">
 														<select name="storage" ng-model="productEdit.storage" required>
 															<option value="">--请选择--</option>
-															<option value="1">分件</option>
+															<option value="1">包装垛存</option>
 															<option value="2">油罐</option>
 														</select> <i></i>
 													</label>
 												</th>
 											</tr>
+											<tr>
+												<th>
+													<label class="label txt-bg-red">作业类型：<span style="color: red;">*</span></label>
+												</th>
+												<th>
+													<label class="select">
+														<select name="zylx" ng-model="productEdit.zylx" required ng-change="restZyData(productEdit.zylx)">
+															<option value="">--请选择--</option>
+															<option value="0">入库</option>
+															<option value="1">出库</option>
+														</select> <i></i>
+													</label>
+												</th>
+												<th width='15%'>
+													<label class="label txt-bg-red">是否第一车：<span style="color: red;">*</span></label>
+												</th>
+												<th width='15%'>
+													<label class="select">
+														<select name="sfdyc" ng-model="productEdit.sfdyc" required>
+															<option value="">--请选择--</option>
+															<option ng-selected="true" value="1">否</option>
+															<option value="0">是</option>
+														</select> <i></i>
+													</label>
+												</th>
+												<th width='15%'></th>
+												<th width='15%'></th>
+											</tr>
 										</table>
 
 										<!--存储方式切换--><!--分件-->
@@ -211,29 +239,34 @@
 															   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">入库件数：</label>
+													<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="productEdit.rkjs" ng-readonly="rkjs"
-															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
+														<input type="text" name="recordDateJJ" ng-model="productEdit.recordDate"
+															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">出库件数：</label>
+													<label class="label txt-bg-red">记录人：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="outbound" ng-model="productEdit.ckjs" ng-readonly="ckjs"
+														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
+													</label>
+												</th>
+											</tr>
+											<tr ng-show="productEdit.zylx==0">
+												<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="storage" ng-model="productEdit.rkjs" ng-readonly="rkjs"
 															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
 													</label>
 												</th>
@@ -247,39 +280,37 @@
 															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
 													</label>
 												</th>
-											</tr>
-											<tr>
 												<th width='15%'>
-													<label class="label txt-bg-red">出库数量（吨）：</label>
+													<label class="label txt-bg-red">审核人：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
+														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
 													</label>
 												</th>
+											</tr>
+											<tr ng-show="productEdit.zylx==1">
 												<th width='15%'>
-													<label class="label txt-bg-red">出（入）库时间：<span style="color: red;">*</span></label>
+													<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 HH:mm:ss'})" required />
+														<input type="text" name="outbound" ng-model="productEdit.ckjs" ng-readonly="ckjs"
+															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">记录人：</label>
+													<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"/>
+														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
 													</label>
 												</th>
-											</tr>
-											<tr>
 												<th width='15%'>
 													<label class="label txt-bg-red">审核人：</label>
 												</th>
@@ -289,10 +320,6 @@
 														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
 													</label>
 												</th>
-												<th></th>
-												<th></th>
-												<th></th>
-												<th></th>
 											</tr>
 										</table>
 
@@ -303,81 +330,75 @@
 											</tr>
 											<tr>
 												<th width='15%'>
-													<label class="label txt-bg-red">入库数量（吨）：<span style="color: red;">*</span></label>
+													<label class="label txt-bg-red">液位高度（m）：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
-															   required/>
+														<input type="text" name="liquidLevel" ng-model="productEdit.liquidLevel" />
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">出库数量（吨）：<span style="color: red;">*</span></label>
+													<label class="label txt-bg-red">罐体直径（m）：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
-															   required />
+														<input type="text" name="tankDiameter" ng-model="productEdit.tankDiameter" />
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">液位高度（m）：</label>
+													<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="liquidLevel" ng-model="productEdit.liquidLevel" />
+														<input type="text" name="recordDateYG" ng-model="productEdit.recordDate"
+															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
 													</label>
 												</th>
 											</tr>
 											<tr>
 												<th width='15%'>
-													<label class="label txt-bg-red">罐体直径（m）：</label>
+													<label class="label txt-bg-red">记录人：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="tankDiameter" ng-model="productEdit.tankDiameter" />
+														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true" />
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">出（入）库时间：<span style="color: red;">*</span></label>
+													<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 HH:mm:ss'})" required />
+														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople" />
 													</label>
 												</th>
-												<th width='15%'>
-													<label class="label txt-bg-red">记录人：</label>
+												<th width='15%' ng-show="productEdit.zylx==0">
+													<label class="label txt-bg-red" ng-show="productEdit.zylx==0">入库数量（吨）：<span style="color: red;">*</span></label>
 												</th>
-												<th width='15%'>
+												<th width='15%' ng-show="productEdit.zylx==0">
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true" />
+														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity"
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
+															   required/>
 													</label>
 												</th>
-											</tr>
-											<tr>
-												<th width='15%'>
-													<label class="label txt-bg-red">审核人：</label>
+												<th width='15%' ng-show="productEdit.zylx==1">
+													<label ng-show="productEdit.zylx==1" class="label txt-bg-red">出库数量（吨）：<span style="color: red;">*</span></label>
 												</th>
-												<th width='15%'>
+												<th width='15%' ng-show="productEdit.zylx==1">
 													<label class="input">
 														<i class="input"></i>
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople" />
+														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity"
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
+															   required />
 													</label>
 												</th>
-												<th></th>
-												<th></th>
-												<th></th>
-												<th></th>
 											</tr>
 											<tr>
 												<th width='15%'>

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

@@ -26,7 +26,14 @@
 											</a>&emsp;
 											<label>仓房/油罐名称：
 												<select ng-model="search.houseId" class="form-control input-sm"
-                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list">
+                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
+                                                        ng-change="loadWare(search.houseId)">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+											</label>
+											<label>货位名称：
+												<select ng-model="search.wareId" class="form-control input-sm"
+                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
                                                     <option value="">请选择</option>
                                                 </select>&emsp;
 											</label>
@@ -62,6 +69,7 @@
 											<th data-class="expand" style="text-align:center;">仓房/油罐名称</th>
 											<th data-class="expand" style="text-align:center;">货位名称</th>
 											<th data-class="expand" style="text-align:center;">粮油品种</th>
+											<th data-class="expand" style="text-align:center;">明细品种</th>
 											<th data-class="expand" style="text-align:center;">粮油性质</th>
 											<th data-class="expand" style="text-align:center;">粮油等级</th>
 											<th data-class="expand" style="text-align:center;">入库数量（吨）</th>
@@ -77,6 +85,7 @@
 											<td style="text-align:center;">{{storehouseObj[product.houseId].storehouseName}}</td>
 											<td style="text-align:center;">{{warehouseObj[product.warehouseId].warehouseName}}</td>
 											<td style="text-align:center;">{{dicData[product.lspz]}}</td>
+											<td style="text-align:center;">{{dicData[product.lsmxpz]}}</td>
 											<td style="text-align:center;">{{dicData[product.nature]}}</td>
 											<td style="text-align:center;">{{dicData[product.levels]}}</td>
 											<td style="text-align:center;">{{product.storageQuantity}}</td>

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

@@ -76,10 +76,9 @@
 										<th>明细品种</th>
                                         <th>粮油性质</th>
                                         <th>库存数量(吨)</th>
-<!--                                        <th>已验收数量(吨)</th>-->
-<!--                                        <th>未验收数量(吨)</th>-->
                                         <th>收获年度</th>
-                                        <!-- <th>粮油等级</th> -->
+                                        <th>入仓时间(第一车)</th>
+                                        <th>入库时间(最后一车)</th>
                                     </tr>
                                     </thead>
 
@@ -94,11 +93,10 @@
 										<td>{{dicData[numbermanage.mxpz]}}</td>
                                         <td>{{dicData[numbermanage.hwxz]}}</td>
                                         <td>{{numbermanage.kcsl ? numbermanage.kcsl/1000 : 0 | number : 3}}</td>
-<!--                                        <td>{{numbermanage.rksl ? numbermanage.rksl/1000 : 0 | number : 3}}</td>-->
-<!--                                        <td>{{numbermanage.wyssl ? numbermanage.wyssl/1000 : 0 | number : 3}}</td>-->
                                         <!--收获年度-->
                                         <td>{{dicData[numbermanage.scnf]}}</td>
-                                        <!-- <td>{{ dicData[numbermanage.dj]}}</td> -->
+                                        <td>{{numbermanage.cjsj | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                        <td>{{numbermanage.rq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                     </tr>
                                     </tbody>
 

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

@@ -81,7 +81,7 @@
 											</section>
 
 											<section class="col col-3">
-												<label class="label">入仓日期：<span style="color: red;">*</span></label>
+												<label class="label">入仓日期(第一车)：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.inputTime" ng-disabled="true" placeholder="入仓日期" required>
 												</label>
@@ -90,6 +90,13 @@
 
 										<div class="row">
 											<section class="col col-3">
+												<label class="label">入库日期(最后一车)：<span style="color: red;">*</span></label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
+														   placeholder="入库日期" required>
+												</label>
+											</section>
+											<section class="col col-3">
 												<label class="label">保管员：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.keeper" placeholder="保管员" ng-disabled="true" required>
@@ -885,7 +892,7 @@
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.yellowPart" name="yellowPart" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1232,7 +1239,7 @@
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1965,7 +1972,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.yellowPart}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>
@@ -2238,7 +2245,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheck.yellowRice}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>

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

@@ -131,7 +131,7 @@
 											</section>
 
 											<section class="col col-3">
-												<label class="label">入仓日期：<span style="color: red;">*</span></label>
+												<label class="label">入仓日期(第一车)：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
 														   placeholder="入仓日期" required>
@@ -140,6 +140,13 @@
 										</div>
 
 										<div class="row">
+										    <section class="col col-3">
+												<label class="label">入库日期(最后一车)：<span style="color: red;">*</span></label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
+														   placeholder="入库日期" required>
+												</label>
+											</section>
 											<section class="col col-3">
 												<label class="label">检验类型：<span style="color: red;">*</span></label>
 												<label class="select">
@@ -515,7 +522,7 @@
 														</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td colspan="2" class="text-center">生芽粒%</td>
@@ -1008,7 +1015,7 @@
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.yellowPart" name="yellowPart" ng-blur="zjzl()" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -2318,7 +2325,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheck.yellowPart}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-list.html

@@ -80,7 +80,7 @@
 <!--									<span ng-if="qualitycheck.checkResult=='0'">合格</span>-->
 <!--									<span ng-if="qualitycheck.checkResult=='1'">不合格</span>-->
 <!--								</td>-->
-                        		<td>{{qualitycheck.checkTime | date :'yyyy-MM-dd '}}</td>
+                        		<td>{{qualitycheck.checkTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                         		<td>
 									<!--<a has-permission="475" href-void ng-click="showAddAck(qualitycheck.id,qualitycheck.houseId,qualitycheck.warehouseId)"><i class="fa fa-plus"></i>验收</a>&nbsp;&nbsp;-->
                         			<a  href-void ng-click="showViewFck(qualitycheck.id)"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;

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

@@ -131,7 +131,7 @@
 											</section>
 
 											<section class="col col-3">
-												<label class="label">入仓日期：<span style="color: red;">*</span></label>
+												<label class="label">入仓日期(第一车)：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
 														   placeholder="入仓日期" required>
@@ -141,6 +141,13 @@
 
 										<div class="row">
 											<section class="col col-3">
+												<label class="label">入库日期(最后一车)：<span style="color: red;">*</span></label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
+														   placeholder="入库日期" required>
+												</label>
+											</section>
+											<section class="col col-3">
 												<label class="label">保管员：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.keeper" ng-disabled="isNotEdit" name="keeper" placeholder="保管员" required>
@@ -505,7 +512,7 @@
 														</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td colspan="2" class="text-center">生芽粒%</td>
@@ -989,7 +996,7 @@
 														<td class="text-center" colspan="2">黄粒米%</td>
 														<td class="text-center" colspan="1">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.yellowPart" name="yellowPart" ng-blur="zjzl()" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td colspan="2" class="text-center">互混率%</td>
@@ -1346,7 +1353,7 @@
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -2137,7 +2144,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.yellowPart}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>
@@ -2410,7 +2417,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheck.yellowRice}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>

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

@@ -131,7 +131,7 @@
 											</section>
 
 											<section class="col col-3">
-												<label class="label">入仓日期：<span style="color: red;">*</span></label>
+												<label class="label">入仓日期(第一车)：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
 														   placeholder="入仓日期" required>
@@ -141,6 +141,13 @@
 
 										<div class="row">
 											<section class="col col-3">
+												<label class="label">入库日期(最后一车)：<span style="color: red;">*</span></label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
+														   placeholder="入库日期" required>
+												</label>
+											</section>
+											<section class="col col-3">
 												<label class="label">检验类型：<span style="color: red;">*</span></label>
 												<label class="select">
 													<select name="type" ng-model="qualitycheck.type" ng-disabled="isNotEdit" required>
@@ -1396,7 +1403,7 @@
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -2549,7 +2556,7 @@
 						</td>
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheck.yellowRice}}
+							{{qualitycheckInspection.yellowRice}}
 						</td>
 					</tr>
 					<tr>

src/main/resources/static/app/system/views/user-edit.html

@@ -158,7 +158,7 @@
 											<label class="label">手机号<span style="color: red;">*</span></label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-mobile-phone"></i>
-												<input type="text" ng-model="user.mobile" name="mobile" maxlength="20" required />
+												<input type="text" ng-model="user.mobile" name="mobile" maxlength="11" required />
 											</label>
 										</section>
 									</div>