fanxw před 2 roky
rodič
revize
1164a401d3
28 změnil soubory, kde provedl 449 přidání a 223 odebrání
  1. 3 3
      src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js
  2. 25 16
      src/main/resources/static/app/home/controller/quxtCtrl.js
  3. 28 17
      src/main/resources/static/app/storage/controller/qualitycheckCtrl.js
  4. 3 3
      src/main/resources/static/app/storage/grainCard/controller/checkFoodSituationListCtrl.js
  5. 12 2
      src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js
  6. 12 3
      src/main/resources/static/app/storage/grainCard/controller/oilCarAddCtrl.js
  7. 42 7
      src/main/resources/static/app/storage/grainCard/controller/productGrainAddCtrl.js
  8. 1 0
      src/main/resources/static/app/storage/grainCard/controller/productGrainCheckCtrl.js
  9. 1 1
      src/main/resources/static/app/storage/grainCard/views/addQualityInspection.html
  10. 31 29
      src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html
  11. 2 2
      src/main/resources/static/app/storage/grainCard/views/foodSituationList.html
  12. 34 8
      src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html
  13. 33 9
      src/main/resources/static/app/storage/grainCard/views/oilCarAdd.html
  14. 33 15
      src/main/resources/static/app/storage/grainCard/views/productGrain-add.html
  15. 14 13
      src/main/resources/static/app/storage/grainCard/views/productGrain-check-G.html
  16. 2 2
      src/main/resources/static/app/storage/grainCard/views/productGrainList.html
  17. 24 6
      src/main/resources/static/app/storage/product/controller/productCtrl.js
  18. 3 1
      src/main/resources/static/app/storage/product/service/productService.js
  19. 6 2
      src/main/resources/static/app/storage/product/views/inventoryQuantity-list.html
  20. 78 57
      src/main/resources/static/app/storage/product/views/product-edit.html
  21. 10 1
      src/main/resources/static/app/storage/product/views/product-list.html
  22. 4 6
      src/main/resources/static/app/storage/views/numberManage/numberManage-list.html
  23. 12 5
      src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-acceptcheck-edit.html
  24. 11 4
      src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html
  25. 1 1
      src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-list.html
  26. 13 6
      src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-edit.html
  27. 10 3
      src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-springcheck-edit.html
  28. 1 1
      src/main/resources/static/app/system/views/user-edit.html

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

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

+ 25 - 16
src/main/resources/static/app/home/controller/quxtCtrl.js

@@ -30,16 +30,25 @@ angular.module('app.system').controller("quxtCtrl",
30 30
         // 五温检查列表
31 31
         $scope.loadThreeTemperature= function() {
32 32
             //查询三温检查列表最新数据所对应的仓房
33
-        	StorehouseService.getThreeTempCheckList($rootScope.orgInfo.orgId).then(function(data){
34
-                if((data.houseList).length>0){
35
-                	$scope.houseId = data.houseList[0].storehouseId;
36
-                }else{
37
-            		$scope.houseId = "";
38
-            	}
39
-                $scope.newInit();
40
-            },function (data) {
41
-                console.log(data);
33
+        	StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(datae){
34
+                if((datae.houseList).length>0){
35
+                    $scope.storehouseList = datae.houseList;  //下拉列表数据
36
+                    $scope.storehouseCode = datae.houseList[0].storehouseCode;
37
+                    $scope.newInit();
38
+                }
39
+            },function (datae) {
40
+                console.log(datae);
42 41
             });
42
+//        	StorehouseService.getThreeTempCheckList($rootScope.orgInfo.orgId).then(function(datas){
43
+//        		if (datas.houseList != null) {
44
+//        			$scope.houseId = datas.houseList[0].storehouseId;
45
+//        			$scope.newInit();
46
+//        		} else {
47
+//        			
48
+//            	}
49
+//            },function (datas) {
50
+//                console.log(datas);
51
+//            });
43 52
 
44 53
         }
45 54
 
@@ -47,7 +56,7 @@ angular.module('app.system').controller("quxtCtrl",
47 56
 
48 57
 
49 58
         $scope.newInit = function () {
50
-            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$rootScope.storehouseObj[parseInt($scope.houseId)].storehouseCode,"7").then(function(data){
59
+            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$scope.storehouseCode,"7").then(function(data){
51 60
                 //初始化echarts 图表
52 61
                 var option = {
53 62
                     tooltip : {
@@ -219,15 +228,15 @@ angular.module('app.system').controller("quxtCtrl",
219 228
                     $("#quxt").prepend($compile(sele)($scope)); 
220 229
                     //查询仓房下拉菜单
221 230
 
222
-                    StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(data){
223
-                        if((data.houseList).length>0){
224
-                            $scope.storehouseList = data.houseList;  //下拉列表数据
231
+                    StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(function(dataes){
232
+                        if((dataes.houseList).length>0){
233
+                            $scope.storehouseList = dataes.houseList;  //下拉列表数据
225 234
                             if($scope.houseId == ""){
226
-                            	$scope.houseId = data.houseList[0].storehouseId;
235
+                            	$scope.storehouseCode = dataes.houseList[0].storehouseCode;
227 236
                             }
228 237
                         }
229
-                    },function (data) {
230
-                        console.log(data);
238
+                    },function (dataes) {
239
+                        console.log(dataes);
231 240
                     });
232 241
 
233 242
                 }

+ 28 - 17
src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -285,7 +285,8 @@ angular.module('app.storage')
285 285
                 $scope.qualitycheck.houseId = data.qualitycheck.houseId.toString();
286 286
                 $scope.qualitycheck.wareHouseName = data.wareHouseName;//用于验收,春秋的回显
287 287
                 $scope.qualitycheck.inspectionStandardBasis = parseInt($scope.qualitycheck.inspectionStandardBasis);
288
-                $scope.qualitycheck.inputTime = $filter('date')($scope.qualitycheck.inputTime, "yyyy-MM-dd");
288
+                $scope.qualitycheck.inputTime = $scope.qualitycheck.inputTime.substr(0,10);
289
+                $scope.qualitycheck.zhycsj = $scope.qualitycheck.zhycsj.substr(0,10);
289 290
                 $scope.qualitycheck.chooseTime = $filter('date')($scope.qualitycheck.chooseTime, "yyyy-MM-dd HH:mm:ss");
290 291
                 $scope.qualitycheck.checkTime = $filter('date')($scope.qualitycheck.checkTime, "yyyy-MM-dd HH:mm:ss");
291 292
                 $scope.qualitycheck.applyCheckTime = $filter('date')($scope.qualitycheck.applyCheckTime, "yyyy-MM-dd");
@@ -297,7 +298,7 @@ angular.module('app.storage')
297 298
                 $scope.qualitycheck.checkResultTime = $filter('date')($scope.qualitycheck.checkResultTime, "yyyy-MM-dd HH:mm:ss");
298 299
                 $scope.qualitycheck.qfrq = $filter('date')($scope.qualitycheck.qfrq, "yyyy-MM-dd");//签发日期
299 300
                 $scope.change(0);//点击仓房切换货位
300
-                if ($stateParams.isNotEdit == "false") {
301
+                if ($scope.qualitycheck.id == null) {
301 302
                     $scope.qualitycheck.checker = $rootScope.userInfo.realName; //检验人,只有在新增和修改的时候才展示为当前登录人
302 303
                 }
303 304
                 if($stateParams.depotType == "1"){
@@ -614,7 +615,8 @@ angular.module('app.storage')
614 615
                             $scope.qualitycheck.subTypeDetailed = parseInt($scope.keepaccount.mxpz);//明细品种
615 616
                             $scope.qualitycheck.numberUpdate = $scope.keepaccount.kcsl;//数量
616 617
                             $scope.qualitycheck.harvestTime = parseInt($scope.keepaccount.scnf);//收货年度
617
-                            $scope.qualitycheck.inputTime = $filter('date')($scope.keepaccount.rq, "yyyy-MM-dd");//入仓时间
618
+                            $scope.qualitycheck.inputTime = $scope.keepaccount.cjsj.substr(0,10);//入仓时间
619
+                            $scope.qualitycheck.zhycsj = $scope.keepaccount.rq.substr(0,10);//入仓时间
618 620
                             // $scope.qualitycheck.checkTime = getNowFormatDate(); //检验日期
619 621
                             $scope.qualitycheck.quality = $scope.keepaccount.hwxz; //货位性质 (储粮性质)主要用于封仓管理中验证某个性质
620 622
                             $scope.qualitycheck.location = parseInt($scope.keepaccount.gb); //产地
@@ -664,7 +666,8 @@ angular.module('app.storage')
664 666
                             		}
665 667
                             	}
666 668
                             }
667
-                            $scope.qualitycheck.inputTime = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd");//入仓时间
669
+                            $scope.qualitycheck.inputTime = $scope.qualityFinishedCard.rksj.substr(0,10);//入仓时间
670
+                            $scope.qualitycheck.zhycsj = $scope.qualityFinishedCard.zhycsj.substr(0,10);//入库时间
668 671
                             // $scope.qualitycheck.checkTime = getNowFormatDate(); //检验日期
669 672
                             $scope.qualitycheck.quality = $scope.qualityFinishedCard.lyxz; //货位性质 (储粮性质)主要用于封仓管理中验证某个性质
670 673
                             $scope.qualitycheck.location = parseInt($scope.qualityFinishedCard.lycd); //产地
@@ -753,11 +756,11 @@ angular.module('app.storage')
753 756
         	var pz = $scope.qualitycheck.subType;
754 757
         	if (pz=="3164") {
755 758
         		var sf = parseFloat($scope.qualitycheck.water);//水分
756
-        		$scope.qualitycheck.water = $scope.getMath(sf);
759
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
757 760
         		var rz = parseFloat($scope.qualitycheckInspection.unitWeight);//容重
758
-        		$scope.qualitycheckInspection.unitWeight = $scope.getMath(rz);
761
+        		$scope.qualitycheckInspection.unitWeight = $scope.getMath1(rz);
759 762
         		var xmydzs = parseFloat($scope.qualitycheck.hardIndex);//小麦硬度指数
760
-        		$scope.qualitycheck.hardIndex = $scope.getMath(xmydzs);
763
+        		$scope.qualitycheck.hardIndex = $scope.getMath1(xmydzs);
761 764
         		var mineral = parseFloat($scope.qualitycheck.mineral);//矿物质
762 765
         		//mineral = isNaN(mineral) ? 0.00 : mineral;
763 766
         		$scope.qualitycheck.mineral = $scope.getMath(mineral);
@@ -794,6 +797,8 @@ angular.module('app.storage')
794 797
         		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
795 798
         		//bblzl = isNaN(bblzl) ? 0 : bblzl;
796 799
         		//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
800
+        		var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
801
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
797 802
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
798 803
         			//杂质总量
799 804
         			var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
@@ -810,13 +815,13 @@ angular.module('app.storage')
810 815
         		}
811 816
         	} else if (pz=="3166") {
812 817
         		var sf = parseFloat($scope.qualitycheck.water);//水分
813
-        		$scope.qualitycheck.water = $scope.getMath(sf);
818
+        		$scope.qualitycheck.water = $scope.getMath1(sf);
814 819
         		var ccl = parseFloat($scope.qualitycheck.huskedRation);//出糙率
815
-        		$scope.qualitycheck.huskedRation = $scope.getMath(ccl);
820
+        		$scope.qualitycheck.huskedRation = $scope.getMath1(ccl);
816 821
         		var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
817 822
         		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
818 823
         		var zjml = parseFloat($scope.qualitycheck.fullGoodRation);//整精米率
819
-        		$scope.qualitycheck.fullGoodRation = $scope.getMath(zjml);
824
+        		$scope.qualitycheck.fullGoodRation = $scope.getMath1(zjml);
820 825
         		var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
821 826
         		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
822 827
         		var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
@@ -832,15 +837,15 @@ angular.module('app.storage')
832 837
         		var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
833 838
         		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
834 839
         		var gwcm = parseFloat($scope.qualitycheck.outHuskedRation);//谷外糙米
835
-        		$scope.qualitycheck.outHuskedRation = $scope.getMath(gwcm);
840
+        		$scope.qualitycheck.outHuskedRation = $scope.getMath1(gwcm);
836 841
         		var cml = parseFloat($scope.qualitycheckInspection.riceYield);//出米率
837
-        		$scope.qualitycheckInspection.riceYield = $scope.getMath(cml);
838
-        		var hlm = parseFloat($scope.qualitycheck.yellowPart);//黄粒米
839
-        		$scope.qualitycheck.yellowPart = $scope.getMath(hlm);
842
+        		$scope.qualitycheckInspection.riceYield = $scope.getMath1(cml);
843
+        		var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
844
+        		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
840 845
         		var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
841
-        		$scope.qualitycheck.intermixingRate = $scope.getMath(hhl);
846
+        		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
842 847
         		var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
843
-        		$scope.qualitycheckInspection.inputTwo = $scope.getMath(zdy);
848
+        		$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
844 849
         		
845 850
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
846 851
         			//杂质总量=筛下物+有机杂质+无机杂质,四舍五入,保留一位小数
@@ -910,6 +915,12 @@ angular.module('app.storage')
910 915
                         $scope.qualitycheck.inputTime = $filter('date')(item.value, "yyyy-MM-dd");
911 916
                     }
912 917
                 });
918
+                //入库日期
919
+                $("input[name='zhycsj']").each(function(j,item){
920
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
921
+                        $scope.qualitycheck.zhycsj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
922
+                    }
923
+                });
913 924
                 //扦样日期
914 925
                 $("input[name='chooseTime']").each(function(j,item){
915 926
                     if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
@@ -932,7 +943,7 @@ angular.module('app.storage')
932 943
                 }
933 944
 
934 945
                 if (qysj!= "" && jysj!= "" && qysj > jysj) {
935
-                    alert( "扦样日期应该早于检验日期!");
946
+                    alert( "扦样时间应该早于检验时间!");
936 947
                     return false;
937 948
                 }
938 949
 

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

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

+ 12 - 2
src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js

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

+ 12 - 3
src/main/resources/static/app/storage/grainCard/controller/oilCarAddCtrl.js

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

+ 42 - 7
src/main/resources/static/app/storage/grainCard/controller/productGrainAddCtrl.js

@@ -8,7 +8,7 @@ angular.module('app.storage').controller("productGrainAddCtrl",
8 8
         $scope.grainOrOil = false; // 默认显示仓房信息
9 9
 
10 10
         // 初始化建卡日期
11
-        $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd");
11
+        $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
12 12
 
13 13
         // 保存或修改
14 14
         $scope.loadDataById = function (id) {
@@ -24,9 +24,10 @@ angular.module('app.storage').controller("productGrainAddCtrl",
24 24
                 $scope.cerealsCard.ccfsCode = parseInt(data.data.ccfsCode);
25 25
                 $scope.cerealsCard.lydjCode = parseInt(data.data.lydjCode);
26 26
                 // 时间格式化
27
-                $scope.cerealsCard.rksj = $filter('date')(data.data.rksj, "yyyy-MM-dd");
27
+                $scope.cerealsCard.rksj = $filter('date')(data.data.rksj, "yyyy-MM-dd HH:mm:ss");
28
+                $scope.cerealsCard.zhycsj = $filter('date')(data.data.zhycsj, "yyyy-MM-dd HH:mm:ss");
28 29
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
29
-                $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd");
30
+                $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd HH:mm:ss");
30 31
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
31 32
                 $scope.getAreaData(); // 树形下拉产地
32 33
                 $scope.getsGrainDetailKind(); //树形下拉明细品种
@@ -34,6 +35,22 @@ angular.module('app.storage').controller("productGrainAddCtrl",
34 35
                 console.log(data);
35 36
             });
36 37
         };
38
+        
39
+        $scope.getMath = function(v) {
40
+            if (isNaN(v) || v == "") {
41
+                v = 0.00;
42
+            } else {
43
+                v = Math.round(v*100)/100;
44
+                v = v.toString();
45
+                var rs = v.indexOf('.');
46
+                if(rs < 0){
47
+                    v = v + ".00";
48
+                }else{
49
+                    while(v.length <= rs + 2){v += '0';}
50
+                }
51
+            }
52
+            return v;
53
+        }
37 54
 
38 55
         // 获取仓房基础信息
39 56
         $scope.findStorehouse = function (houseId) {
@@ -69,10 +86,20 @@ angular.module('app.storage').controller("productGrainAddCtrl",
69 86
                     $scope.cerealsCard.wallCode = data.house; // 仓房结构编码
70 87
                     $scope.cerealsCard.wallName = $rootScope.dicData[data.house]; // 仓房结构名称
71 88
                     $scope.cerealsCard.outsideHeigth = data.storeOutsideHeigth; // 外檐高度(m)
72
-                    $scope.cerealsCard.inLength = data.length; // 仓内长
73
-                    $scope.cerealsCard.inWidth = data.width; // 仓内宽
89
+                    if(data.storehouseType == "2972" || data.storehouseType == "2973"){//仓房类型为圆筒仓和浅圆仓
90
+                    	$scope.cerealsCard.inLength = data.siloDiameter; // 仓内长(筒仓内劲)
91
+                        $scope.cerealsCard.inWidth = null; // 仓内宽
92
+                        var cnc = parseFloat($scope.cerealsCard.siloDiameter == null ? 1 : $scope.cerealsCard.siloDiameter);
93
+                        //var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
94
+                        $scope.cerealsCard.binVolume = $scope.getMath(3.14*(cnc/2)*(cnc/2));// 使用面积
95
+                    } else {
96
+                    	$scope.cerealsCard.inLength = data.length; // 仓内长
97
+                        $scope.cerealsCard.inWidth = data.width; // 仓内宽
98
+                        var cnc = parseFloat($scope.cerealsCard.inLength == null ? 1 : $scope.cerealsCard.inLength);
99
+                        var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
100
+                        $scope.cerealsCard.binVolume = $scope.getMath(cnc*cnk);// 使用面积
101
+                    }
74 102
                     $scope.cerealsCard.grainLineHeigth = data.grainLineHeigth; // 设计装粮线高度高度
75
-                    $scope.cerealsCard.binVolume = data.binVolume; // 使用面积
76 103
                     $scope.cerealsCard.spareFour = '0'; // 0仓房,1油罐
77 104
                 }
78 105
             }, function (data) {
@@ -136,7 +163,8 @@ angular.module('app.storage').controller("productGrainAddCtrl",
136 163
                     $scope.cerealsCard.lypzName = $rootScope.dicData[datas.list[0].lypz];
137 164
                     $scope.cerealsCard.spareThree = parseInt($scope.qualityFinishedCard.mxpz);//明细品种
138 165
                     $scope.cerealsCard.lydjCode = datas.list[0].lydj; //等级
139
-                    $scope.cerealsCard.rksj = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd");//入库时间
166
+                    $scope.cerealsCard.rksj = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd HH:mm:ss");//入仓时间
167
+                    $scope.cerealsCard.zhycsj = $filter('date')($scope.qualityFinishedCard.zhycsj, "yyyy-MM-dd HH:mm:ss");//入库时间
140 168
                     $scope.cerealsCard.lycdCode = parseInt($scope.qualityFinishedCard.lycd);//产地
141 169
                     $scope.cerealsCard.lysl = $scope.qualityFinishedCard.kcsl;//数量
142 170
                     
@@ -219,8 +247,15 @@ angular.module('app.storage').controller("productGrainAddCtrl",
219 247
                 }
220 248
                 // 保存获取时间插件值
221 249
                 $scope.cerealsCard.rksj = $("input[name='rksj']").val();
250
+                $scope.cerealsCard.zhycsj = $("input[name='zhycsj']").val();
222 251
                 $scope.cerealsCard.scrq = $("input[name='scrq']").val();
223 252
                 $scope.cerealsCard.jkrq = $("input[name='jkrq']").val();
253
+                var rcsj = new Date($scope.cerealsCard.rksj.replace( /\-/g, "\/"));
254
+                var jksj = new Date($scope.cerealsCard.jkrq.replace( /\-/g, "\/"));
255
+                if (rcsj!= "" && jksj!= "" && rcsj > jksj) {
256
+                    alert( "入仓时间应该早于建卡时间!");
257
+                    return false;
258
+                }
224 259
 
225 260
                 // 储存方式名称
226 261
                 // $scope.cerealsCard.ccfsName = $rootScope.dicData[$scope.cerealsCard.ccfsCode];

+ 1 - 0
src/main/resources/static/app/storage/grainCard/controller/productGrainCheckCtrl.js

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

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

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

+ 31 - 29
src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -93,7 +93,7 @@
93 93
                                             <tr>
94 94
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐容量(吨)</td>
95 95
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.tankCapacity}}</td>
96
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间</td>
96
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓日期(第一车)</td>
97 97
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
98 98
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">水分及挥发物含量%</td>
99 99
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.waterVolatiles}}</td>
@@ -101,32 +101,32 @@
101 101
                                             <tr>
102 102
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">直径(米)</td>
103 103
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.diameter}}</td>
104
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
105
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
104
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库日期(最后一车)</td>
105
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
106 106
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">不溶性杂质含量%</td>
107 107
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
108 108
                                             </tr>
109 109
                                             <tr>
110 110
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">高度(米)</td>
111 111
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.height}}</td>
112
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
113
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
112
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
113
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
114 114
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">酸价(KOH)/(mg/g)</td>
115 115
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
116 116
                                             </tr>
117 117
                                             <tr>
118 118
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">底面积(平方米)</td>
119 119
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.bottomArea}}</td>
120
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
121
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
120
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
121
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
122 122
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">过氧化值(mmol/kg)</td>
123 123
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.peroxideValue}}</td>
124 124
                                             </tr>
125 125
                                             <tr>
126 126
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计储油高度(米)</td>
127 127
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designHeight}}</td>
128
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
129
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.checkTime}}</td>
128
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
129
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
130 130
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
131 131
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
132 132
                                                 <td class="text-center" colspan="2"
@@ -134,10 +134,10 @@
134 134
                                                 </td>
135 135
                                             </tr>
136 136
                                             <tr>
137
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">状态</td>
137
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">货位状态</td>
138 138
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
139
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
140
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
139
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡时间</td>
140
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
141 141
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
142 142
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
143 143
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">计价数量</td>
@@ -146,8 +146,8 @@
146 146
                                             <tr>
147 147
                                                 "<td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
148 148
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
149
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
150
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
149
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
150
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
151 151
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
152 152
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
153 153
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
@@ -156,12 +156,12 @@
156 156
                                             <tr>
157 157
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">出油口高度(米)</td>
158 158
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.oilHeight}}</td>
159
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
160
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
159 161
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">检查口高度(米)</td>
160 162
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.insportHeight}}</td>
161 163
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
162 164
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
163
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
164
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
165 165
                                             </tr>
166 166
 
167 167
                                             <tr>
@@ -284,7 +284,7 @@
284 284
                                             <tr>
285 285
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年份</td>
286 286
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.useDate}}</td>
287
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间</td>
287
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓日期(第一车)</td>
288 288
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
289 289
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
290 290
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -308,9 +308,9 @@
308 308
                                             </tr>
309 309
                                             <tr>
310 310
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
311
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.house]}}</td>
312
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
313
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
311
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[GrainCardByIdObj.wall]}}</td>
312
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
313
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
314 314
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
315 315
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
316 316
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -335,8 +335,8 @@
335 335
                                             <tr>
336 336
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">外檐高度(米)</td>
337 337
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeOutsideHeigth}}</td>
338
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
339
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
338
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
339
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
340 340
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
341 341
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
342 342
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -362,8 +362,8 @@
362 362
                                             <tr>
363 363
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内长(直径)</td>
364 364
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.length}}</td>
365
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
366
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
365
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
366
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
367 367
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
368 368
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
369 369
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
@@ -384,15 +384,15 @@
384 384
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
385 385
                                                     {{grainCardView.outHuskedRation}}
386 386
                                                 </td>
387
-                                                <td class="text-center" rowspan="3" colspan="2"
387
+                                                <td class="text-center" rowspan="2" colspan="2"
388 388
                                                     style="vertical-align: middle;border:1px solid #ccc;vertical-align: middle;text-align: center;">{{grainCardView.keeperNames}}
389 389
                                                 </td>
390 390
                                             </tr>
391 391
                                             <tr>
392 392
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽</td>
393 393
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
394
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
395
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate | date:'yyyy-MM-dd'}}</td>
394
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
395
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
396 396
                                                 
397 397
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
398 398
 
@@ -415,6 +415,8 @@
415 415
                                             <tr>
416 416
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计装粮线高度(米)</td>
417 417
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainLineHeigth}}</td>
418
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">建卡时间</td>
419
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
418 420
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">储存方式</td>
419 421
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.keepingWay]}}</td>
420 422
                                                 
@@ -432,7 +434,7 @@
432 434
                                                 </td>
433 435
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">黄粒米%</td>
434 436
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
435
-                                                    {{grainCardView.yellowPart}}
437
+                                                    {{grainCardView.qualitycheckInspection.yellowRice}}
436 438
                                                 </td>
437 439
                                             </tr>
438 440
                                             <tr>
@@ -965,7 +967,7 @@
965 967
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.mildewCount}}</td>
966 968
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.outHuskedRation}}</td>
967 969
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.intermixingRate}}</td>
968
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.yellowPart}}</td>
970
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.qualitycheckInspection.yellowRice}}</td>
969 971
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{quailckCard.colorsmell}}</td>
970 972
                                                 <td class="text-center" colspan="3" style="word-break: break-all;vertical-align: middle;text-align: center;">{{quailckCard.checker}}</td>
971 973
                                                 <td class="text-center" colspan="2" style="vertical-align: middle;vertical-align: middle;text-align: center;">

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

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

+ 34 - 8
src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -72,14 +72,14 @@
72 72
                                         </tr>
73 73
                                         <tr>
74 74
                                             <th>
75
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期:<span style="color: red;">*</span></label>
75
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间:<span style="color: red;">*</span></label>
76 76
                                             </th>
77 77
                                             <th>
78 78
                                                 <section>
79 79
                                                     <label class="input">
80 80
                                                         <input type="text" ng-model="grainCard.acceptDate"
81 81
                                                                name="acceptDate" class="form-control Wdate"
82
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
82
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
83 83
                                                     </label>
84 84
                                                 </section>
85 85
                                             </th>
@@ -99,7 +99,7 @@
99 99
                                                 </section>
100 100
                                             </th>
101 101
                                             <th style="border-bottom-width:1px">
102
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨):</label>
102
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨):</label>
103 103
                                             </th>
104 104
                                             <th style="border-bottom-width:1px">
105 105
                                                 <section>
@@ -114,6 +114,30 @@
114 114
 
115 115
                                         <tr>
116 116
                                             <th>
117
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓日期(第一车):<span style="color: red;">*</span></label>
118
+                                            </th>
119
+                                            <th>
120
+                                                <section>
121
+                                                    <label class="input">
122
+                                                        <input type="text" ng-model="rcsj"
123
+                                                               name="rcsj" class="form-control Wdate"
124
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
125
+                                                    </label>
126
+                                                </section>
127
+                                            </th>
128
+                                            <th>
129
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库日期(最后一车):<span style="color: red;">*</span></label>
130
+                                            </th>
131
+                                            <th>
132
+                                                <section>
133
+                                                    <label class="input">
134
+                                                        <input type="text" ng-model="rksj"
135
+                                                               name="rksj" class="form-control Wdate"
136
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
137
+                                                    </label>
138
+                                                </section>
139
+                                            </th>
140
+                                            <th>
117 141
                                                 <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
118 142
                                             </th>
119 143
                                             <th>
@@ -124,6 +148,8 @@
124 148
                                                     </label>
125 149
                                                 </section>
126 150
                                             </th>
151
+                                        </tr>
152
+                                        <tr>
127 153
                                             <th>
128 154
                                                 <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
129 155
                                             </th>
@@ -149,10 +175,6 @@
149 175
                                                     </label>
150 176
                                                 </section>
151 177
                                             </th>
152
-                                        </tr>
153
-
154
-                                        
155
-                                        <tr>
156 178
                                             <th>
157 179
                                                 <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
158 180
                                             </th>
@@ -164,7 +186,9 @@
164 186
                                                     </label>
165 187
                                                 </section>
166 188
                                             </th>
167
-                                            <th>
189
+                                        </tr>
190
+                                        <tr>
191
+                                        	<th>
168 192
                                                 <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
169 193
                                             </th>
170 194
                                             <th style="border-bottom-width:1px">
@@ -192,6 +216,8 @@
192 216
                                                     </label>
193 217
                                                 </section>
194 218
                                             </th>
219
+                                            <th></th>
220
+                                            <th></th>
195 221
                                         </tr>
196 222
                                         <tr>
197 223
                                             <th>

+ 33 - 9
src/main/resources/static/app/storage/grainCard/views/oilCarAdd.html

@@ -54,14 +54,14 @@
54 54
                                                 </section>
55 55
                                             </th>
56 56
                                             <th width='10%'>
57
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期<span style="color: red;">*</span></label>
57
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间<span style="color: red;">*</span></label>
58 58
                                             </th>
59 59
                                             <th width='20%'>
60 60
                                                 <section>
61 61
                                                     <label class="input">
62 62
                                                         <input type="text" ng-model="oilCard.acceptDate"
63 63
                                                                name="acceptDate" class="form-control Wdate"
64
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
64
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
65 65
                                                     </label>
66 66
                                                 </section>
67 67
                                             </th>
@@ -83,7 +83,7 @@
83 83
                                                 </section>
84 84
                                             </th>
85 85
                                             <th style="border-bottom-width:1px">
86
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
86
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
87 87
                                             </th>
88 88
                                             <th style="border-bottom-width:1px">
89 89
                                                 <section>
@@ -107,6 +107,30 @@
107 107
                                         </tr>
108 108
                                         <tr>
109 109
                                             <th>
110
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓日期(第一车):<span style="color: red;">*</span></label>
111
+                                            </th>
112
+                                            <th>
113
+                                                <section>
114
+                                                    <label class="input">
115
+                                                        <input type="text" ng-model="rcsj"
116
+                                                               name="rcsj" class="form-control Wdate"
117
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
118
+                                                    </label>
119
+                                                </section>
120
+                                            </th>
121
+                                            <th>
122
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库日期(最后一车):<span style="color: red;">*</span></label>
123
+                                            </th>
124
+                                            <th>
125
+                                                <section>
126
+                                                    <label class="input">
127
+                                                        <input type="text" ng-model="rksj"
128
+                                                               name="rksj" class="form-control Wdate"
129
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
130
+                                                    </label>
131
+                                                </section>
132
+                                            </th>
133
+                                            <th>
110 134
                                                 <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
111 135
                                             </th>
112 136
                                             <th>
@@ -117,6 +141,8 @@
117 141
                                                     </label>
118 142
                                                 </section>
119 143
                                             </th>
144
+                                        </tr>
145
+                                        <tr>
120 146
                                             <th>
121 147
                                                 <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
122 148
                                             </th>
@@ -142,8 +168,6 @@
142 168
                                                     </label>
143 169
                                                 </section>
144 170
                                             </th>
145
-                                        </tr>
146
-                                        <tr>
147 171
                                             <th>
148 172
                                                 <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
149 173
                                             </th>
@@ -155,6 +179,9 @@
155 179
                                                     </label>
156 180
                                                 </section>
157 181
                                             </th>
182
+                                            <!-- <th colspan="4"></th> -->
183
+                                        </tr>
184
+                                        <tr>
158 185
                                             <th>
159 186
                                                 <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
160 187
                                             </th>
@@ -172,13 +199,10 @@
172 199
                                                     </label>
173 200
                                                 </section>
174 201
                                             </th>
175
-                                            <!-- <th colspan="4"></th> -->
176
-                                        </tr>
177
-                                        <tr>
178 202
                                             <th>
179 203
                                                 <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
180 204
                                             </th>
181
-                                            <th style="border-bottom-width:1px" colspan="5">
205
+                                            <th style="border-bottom-width:1px" colspan="3">
182 206
                                                 <section>
183 207
                                                     <label class="input">
184 208
                                                         <input type="text" ng-model="oilCard.remark"

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

@@ -92,14 +92,26 @@
92 92
                                         <!--第二个tr开始 -->
93 93
                                         <tr>
94 94
                                             <th width='10%'>
95
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
95
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
96 96
                                             </th>
97 97
                                             <th width='20%'>
98 98
                                                 <section>
99 99
                                                     <label class="input">
100 100
                                                         <input type="text" ng-model="cerealsCard.rksj"
101 101
                                                                name="rksj" class="form-control Wdate" ng-readonly="true"
102
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
102
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
103
+                                                    </label>
104
+                                                </section>
105
+                                            </th>
106
+                                            <th width='10%'>
107
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间(最后一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
108
+                                            </th>
109
+                                            <th width='20%'>
110
+                                                <section>
111
+                                                    <label class="input">
112
+                                                        <input type="text" ng-model="cerealsCard.zhycsj"
113
+                                                               name="zhycsj" class="form-control Wdate" ng-readonly="true"
114
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
103 115
                                                     </label>
104 116
                                                 </section>
105 117
                                             </th>
@@ -115,6 +127,10 @@
115 127
                                                     </label>
116 128
                                                 </section>
117 129
                                             </th>
130
+                                        </tr>
131
+                                        <!--第二个tr结束 -->
132
+                                        <!--第三个tr开始 -->
133
+                                        <tr>
118 134
                                             <th style="border-bottom-width:1px">
119 135
                                                 <label class="label" style="margin-top: 9px;text-align: center;">产地</label>
120 136
                                             </th>
@@ -134,10 +150,6 @@
134 150
                                                     </label>
135 151
                                                 </section>
136 152
                                             </th>
137
-                                        </tr>
138
-                                        <!--第二个tr结束 -->
139
-                                        <!--第三个tr开始 -->
140
-                                        <tr>
141 153
                                             <th style="border-bottom-width:1px">
142 154
                                                 <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
143 155
                                             </th>
@@ -160,6 +172,9 @@
160 172
                                                     </label>
161 173
                                                 </section>
162 174
                                             </th>
175
+                                        </tr>
176
+                                        <!--第三个tr结束 -->
177
+                                        <tr>
163 178
                                             <th>
164 179
                                                 <label class="label" style="margin-top: 9px;text-align: center;">包装规格</label>
165 180
                                             </th>
@@ -171,17 +186,14 @@
171 186
                                                     </label>
172 187
                                                 </section>
173 188
                                             </th>
174
-                                        </tr>
175
-                                        <!--第三个tr结束 -->
176
-                                        <tr>
177 189
                                             <th>
178
-                                                <label class="label" style="margin-top: 9px;text-align: center;">品牌</label>
190
+                                                <label class="label" style="margin-top: 9px;text-align: center;">品牌(厂家)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
179 191
                                             </th>
180 192
                                             <th>
181 193
                                                 <section>
182 194
                                                     <label class="input">
183 195
                                                         <input class="form-control" type="text" ng-model="cerealsCard.pinp"
184
-                                                               name="pinp">
196
+                                                               name="pinp" required />
185 197
                                                     </label>
186 198
                                                 </section>
187 199
                                             </th>
@@ -193,7 +205,7 @@
193 205
                                                     <label class="select">
194 206
                                                         <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
195 207
                                                             <option value="">--请选择--</option>
196
-                                                            <option value="分件">分件</option>
208
+                                                            <option value="包装垛存">包装垛存</option>
197 209
                                                             <option value="油罐">油罐</option>
198 210
                                                         </select><i></i>
199 211
                                                         <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"
@@ -203,17 +215,23 @@
203 215
                                                     </label>
204 216
                                                 </section>
205 217
                                             </th>
206
-                                            <th>
207
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期</label>
218
+                                        </tr>
219
+                                        <tr>
220
+                                        	<th>
221
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间</label>
208 222
                                             </th>
209 223
                                             <th>
210 224
                                                 <section>
211 225
                                                     <label class="input">
212 226
                                                         <input class="form-control Wdate" type="text" ng-model="cerealsCard.jkrq"
213
-                                                               name="jkrq" onClick="WdatePicker({lang:'zh-cn'})">
227
+                                                               name="jkrq" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})">
214 228
                                                     </label>
215 229
                                                 </section>
216 230
                                             </th>
231
+                                            <th></th>
232
+                                            <th></th>
233
+                                            <th></th>
234
+                                            <th></th>
217 235
                                         </tr>
218 236
                                     </table>
219 237
                                     <div>

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

@@ -28,42 +28,43 @@
28 28
     <tr>
29 29
         <td style="vertical-align: middle;text-align: center;" height="56px">仓房类型</td>
30 30
         <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.storehouseType]}}</td>
31
-        <td style="vertical-align: middle;text-align: center;">入库时间</td>
31
+        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
32 32
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
33 33
     </tr>
34 34
     <tr>
35
+        <td style="vertical-align: middle;text-align: center;" height="56px">入库时间(最后一车)</td>
36
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
35 37
         <td style="vertical-align: middle;text-align: center;" height="56px">建设年份</td>
36 38
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.buildDate}}</td>
37
-        <td style="vertical-align: middle;text-align: center;">生产日期</td>
38
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
39 39
     </tr>
40 40
     <tr>
41
+        <td style="vertical-align: middle;text-align: center;">生产日期</td>
42
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
41 43
         <td style="vertical-align: middle;text-align: center;" height="56px">仓房结构</td>
42 44
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.wallName}}</td>
43
-
44
-        <td style="vertical-align: middle;text-align: center;">产地</td>
45
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
46 45
     </tr>
47 46
     <tr>
47
+        <td style="vertical-align: middle;text-align: center;">产地</td>
48
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
48 49
         <td style="vertical-align: middle;text-align: center;" height="56px">外檐高度</td>
49 50
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.outsideHeigth}}</td>
50
-        <td style="vertical-align: middle;text-align: center;">数量</td>
51
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
52 51
     </tr>
53 52
     <tr>
53
+        <td style="vertical-align: middle;text-align: center;">数量</td>
54
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
54 55
         <td style="vertical-align: middle;text-align: center;" height="56px">仓内长(直径)</td>
55 56
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inLength}}</td>
56
-        <td style="vertical-align: middle;text-align: center;">件数</td>
57
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
58
-        <td rowspan="3" colspan="2" style="vertical-align: middle;text-align: center">{{cerealsCard.storemanName}}</td>
57
+        <td rowspan="2" colspan="2" style="vertical-align: middle;text-align: center">{{cerealsCard.storemanName}}</td>
59 58
     </tr>
60 59
     <tr>
60
+        <td style="vertical-align: middle;text-align: center;">包数</td>
61
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
61 62
         <td style="vertical-align: middle;text-align: center;" height="56px">仓内宽</td>
62 63
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inWidth}}</td>
63
-        <td style="vertical-align: middle;text-align: center;">包装规格</td>
64
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
65 64
     </tr>
66 65
     <tr>
66
+        <td style="vertical-align: middle;text-align: center;">包装规格</td>
67
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
67 68
         <td style="vertical-align: middle;text-align: center;" height="56px">设计装粮线高度</td>
68 69
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.grainLineHeigth}}</td>
69 70
         <td style="vertical-align: middle;text-align: center;">品牌</td>

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

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

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

@@ -134,6 +134,14 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
134 134
 
135 135
 			$("#product-form input").attr("disabled",$scope.disabled );
136 136
 			$("#product-form select").attr("disabled",$scope.disabled );
137
+			
138
+			if ($scope.productEdit.zylx=="0") {
139
+				$scope.rkzy = true;
140
+				$scope.ckzy = false;
141
+			} else if ($scope.productEdit.zylx=="1") {
142
+				$scope.rkzy = false;
143
+				$scope.ckzy = true;
144
+			}
137 145
 		},function(data){
138 146
 			console.log();
139 147
 		});
@@ -263,6 +271,16 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
263 271
 			console.log(data);
264 272
 		});
265 273
 	};
274
+	
275
+	$scope.restZyData = function(zylx) {
276
+		if (zylx == "0") {
277
+			$scope.productEdit.ckjs = null;
278
+			$scope.productEdit.outboundQuantity = null;
279
+		} else if (zylx == "1") {
280
+			$scope.productEdit.rkjs = null;
281
+			$scope.productEdit.storageQuantity = null;
282
+		} 
283
+	}
266 284
 
267 285
 	// 计算库存数量
268 286
 	$scope.calculate = function() {
@@ -272,19 +290,19 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
272 290
 		nums = parseFloat(nums);
273 291
 		$scope.productEdit.specifications = nums;
274 292
 
275
-        if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== "") {//入库数量不为空的情况
293
+        if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== "" && $scope.productEdit.storageQuantity != null) {//入库数量不为空的情况
276 294
             //把出库件数、出库数量设置为空,并且不可编辑
277
-            $scope.productEdit.ckjs = "";
278
-			$scope.productEdit.outboundQuantity = "";
295
+            $scope.productEdit.ckjs = null;
296
+			$scope.productEdit.outboundQuantity = null;
279 297
 			$scope.ckjs = true;
280 298
 			$scope.cksl = true;
281 299
 			//入库数量和入库设置为可编辑
282 300
 			$scope.rkjs = false;
283 301
 			$scope.rksl = false;
284
-        } else if($scope.productEdit.outboundQuantity !== undefined && $scope.productEdit.outboundQuantity !== "") {//出库数量不为空的情况
302
+        } else if($scope.productEdit.outboundQuantity !== undefined && $scope.productEdit.outboundQuantity !== "" && $scope.productEdit.outboundQuantity != null) {//出库数量不为空的情况
285 303
             //把入库件数、入库数量设置为空,并且不可编辑
286
-			$scope.productEdit.rkjs = "";
287
-			$scope.productEdit.storageQuantity = "";
304
+			$scope.productEdit.rkjs = null;
305
+			$scope.productEdit.storageQuantity = null;
288 306
 			$scope.rkjs = true;
289 307
 			$scope.rksl = true;
290 308
 			//出库数量和出库件数设置为可编辑

+ 3 - 1
src/main/resources/static/app/storage/product/service/productService.js

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

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

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

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

@@ -187,12 +187,40 @@
187 187
 													<label class="select">
188 188
 														<select name="storage" ng-model="productEdit.storage" required>
189 189
 															<option value="">--请选择--</option>
190
-															<option value="1">分件</option>
190
+															<option value="1">包装垛存</option>
191 191
 															<option value="2">油罐</option>
192 192
 														</select> <i></i>
193 193
 													</label>
194 194
 												</th>
195 195
 											</tr>
196
+											<tr>
197
+												<th>
198
+													<label class="label txt-bg-red">作业类型:<span style="color: red;">*</span></label>
199
+												</th>
200
+												<th>
201
+													<label class="select">
202
+														<select name="zylx" ng-model="productEdit.zylx" required ng-change="restZyData(productEdit.zylx)">
203
+															<option value="">--请选择--</option>
204
+															<option value="0">入库</option>
205
+															<option value="1">出库</option>
206
+														</select> <i></i>
207
+													</label>
208
+												</th>
209
+												<th width='15%'>
210
+													<label class="label txt-bg-red">是否第一车:<span style="color: red;">*</span></label>
211
+												</th>
212
+												<th width='15%'>
213
+													<label class="select">
214
+														<select name="sfdyc" ng-model="productEdit.sfdyc" required>
215
+															<option value="">--请选择--</option>
216
+															<option ng-selected="true" value="1">否</option>
217
+															<option value="0">是</option>
218
+														</select> <i></i>
219
+													</label>
220
+												</th>
221
+												<th width='15%'></th>
222
+												<th width='15%'></th>
223
+											</tr>
196 224
 										</table>
197 225
 
198 226
 										<!--存储方式切换--><!--分件-->
@@ -211,29 +239,34 @@
211 239
 															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " required/>
212 240
 													</label>
213 241
 												</th>
214
-												<th></th>
215
-												<th></th>
216
-												<th></th>
217
-												<th></th>
218
-											</tr>
219
-											<tr>
220 242
 												<th width='15%'>
221
-													<label class="label txt-bg-red">入库件数:</label>
243
+													<label class="label txt-bg-red">出(入)库时间:<span style="color: red;">*</span></label>
222 244
 												</th>
223 245
 												<th width='15%'>
224 246
 													<label class="input">
225 247
 														<i class="input"></i>
226
-														<input type="text" name="storage" ng-model="productEdit.rkjs" ng-readonly="rkjs"
227
-															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
248
+														<input type="text" name="recordDateJJ" ng-model="productEdit.recordDate"
249
+															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
228 250
 													</label>
229 251
 												</th>
230 252
 												<th width='15%'>
231
-													<label class="label txt-bg-red">出库件数:</label>
253
+													<label class="label txt-bg-red">记录人:</label>
232 254
 												</th>
233 255
 												<th width='15%'>
234 256
 													<label class="input">
235 257
 														<i class="input"></i>
236
-														<input type="text" name="outbound" ng-model="productEdit.ckjs" ng-readonly="ckjs"
258
+														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
259
+													</label>
260
+												</th>
261
+											</tr>
262
+											<tr ng-show="productEdit.zylx==0">
263
+												<th width='15%'>
264
+													<label class="label txt-bg-red">入库件数:</label>
265
+												</th>
266
+												<th width='15%'>
267
+													<label class="input">
268
+														<i class="input"></i>
269
+														<input type="text" name="storage" ng-model="productEdit.rkjs" ng-readonly="rkjs"
237 270
 															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
238 271
 													</label>
239 272
 												</th>
@@ -247,39 +280,37 @@
247 280
 															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
248 281
 													</label>
249 282
 												</th>
250
-											</tr>
251
-											<tr>
252 283
 												<th width='15%'>
253
-													<label class="label txt-bg-red">出库数量(吨):</label>
284
+													<label class="label txt-bg-red">审核人:</label>
254 285
 												</th>
255 286
 												<th width='15%'>
256 287
 													<label class="input">
257 288
 														<i class="input"></i>
258
-														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
259
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
289
+														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
260 290
 													</label>
261 291
 												</th>
292
+											</tr>
293
+											<tr ng-show="productEdit.zylx==1">
262 294
 												<th width='15%'>
263
-													<label class="label txt-bg-red">出(入)库时间:<span style="color: red;">*</span></label>
295
+													<label class="label txt-bg-red">出库件数:</label>
264 296
 												</th>
265 297
 												<th width='15%'>
266 298
 													<label class="input">
267 299
 														<i class="input"></i>
268
-														<input type="text" name="recordDateJJ" ng-model="productEdit.recordDate"
269
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
300
+														<input type="text" name="outbound" ng-model="productEdit.ckjs" ng-readonly="ckjs"
301
+															   onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' "/>
270 302
 													</label>
271 303
 												</th>
272 304
 												<th width='15%'>
273
-													<label class="label txt-bg-red">记录人:</label>
305
+													<label class="label txt-bg-red">出库数量(吨):</label>
274 306
 												</th>
275 307
 												<th width='15%'>
276 308
 													<label class="input">
277 309
 														<i class="input"></i>
278
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
310
+														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
311
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
279 312
 													</label>
280 313
 												</th>
281
-											</tr>
282
-											<tr>
283 314
 												<th width='15%'>
284 315
 													<label class="label txt-bg-red">审核人:</label>
285 316
 												</th>
@@ -289,10 +320,6 @@
289 320
 														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
290 321
 													</label>
291 322
 												</th>
292
-												<th></th>
293
-												<th></th>
294
-												<th></th>
295
-												<th></th>
296 323
 											</tr>
297 324
 										</table>
298 325
 
@@ -303,81 +330,75 @@
303 330
 											</tr>
304 331
 											<tr>
305 332
 												<th width='15%'>
306
-													<label class="label txt-bg-red">入库数量(吨):<span style="color: red;">*</span></label>
333
+													<label class="label txt-bg-red">液位高度(m):</label>
307 334
 												</th>
308 335
 												<th width='15%'>
309 336
 													<label class="input">
310 337
 														<i class="input"></i>
311
-														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity"
312
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
313
-															   required/>
338
+														<input type="text" name="liquidLevel" ng-model="productEdit.liquidLevel" />
314 339
 													</label>
315 340
 												</th>
316 341
 												<th width='15%'>
317
-													<label class="label txt-bg-red">出库数量(吨):<span style="color: red;">*</span></label>
342
+													<label class="label txt-bg-red">罐体直径(m):</label>
318 343
 												</th>
319 344
 												<th width='15%'>
320 345
 													<label class="input">
321 346
 														<i class="input"></i>
322
-														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity"
323
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
324
-															   required />
347
+														<input type="text" name="tankDiameter" ng-model="productEdit.tankDiameter" />
325 348
 													</label>
326 349
 												</th>
327 350
 												<th width='15%'>
328
-													<label class="label txt-bg-red">液位高度(m):</label>
351
+													<label class="label txt-bg-red">出(入)库时间:<span style="color: red;">*</span></label>
329 352
 												</th>
330 353
 												<th width='15%'>
331 354
 													<label class="input">
332 355
 														<i class="input"></i>
333
-														<input type="text" name="liquidLevel" ng-model="productEdit.liquidLevel" />
356
+														<input type="text" name="recordDateYG" ng-model="productEdit.recordDate"
357
+															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
334 358
 													</label>
335 359
 												</th>
336 360
 											</tr>
337 361
 											<tr>
338 362
 												<th width='15%'>
339
-													<label class="label txt-bg-red">罐体直径(m):</label>
363
+													<label class="label txt-bg-red">记录人:</label>
340 364
 												</th>
341 365
 												<th width='15%'>
342 366
 													<label class="input">
343 367
 														<i class="input"></i>
344
-														<input type="text" name="tankDiameter" ng-model="productEdit.tankDiameter" />
368
+														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true" />
345 369
 													</label>
346 370
 												</th>
347 371
 												<th width='15%'>
348
-													<label class="label txt-bg-red">出(入)库时间:<span style="color: red;">*</span></label>
372
+													<label class="label txt-bg-red">审核人:</label>
349 373
 												</th>
350 374
 												<th width='15%'>
351 375
 													<label class="input">
352 376
 														<i class="input"></i>
353
-														<input type="text" name="recordDateYG" ng-model="productEdit.recordDate"
354
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
377
+														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople" />
355 378
 													</label>
356 379
 												</th>
357
-												<th width='15%'>
358
-													<label class="label txt-bg-red">记录人:</label>
380
+												<th width='15%' ng-show="productEdit.zylx==0">
381
+													<label class="label txt-bg-red" ng-show="productEdit.zylx==0">入库数量(吨):<span style="color: red;">*</span></label>
359 382
 												</th>
360
-												<th width='15%'>
383
+												<th width='15%' ng-show="productEdit.zylx==0">
361 384
 													<label class="input">
362 385
 														<i class="input"></i>
363
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true" />
386
+														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity"
387
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
388
+															   required/>
364 389
 													</label>
365 390
 												</th>
366
-											</tr>
367
-											<tr>
368
-												<th width='15%'>
369
-													<label class="label txt-bg-red">审核人:</label>
391
+												<th width='15%' ng-show="productEdit.zylx==1">
392
+													<label ng-show="productEdit.zylx==1" class="label txt-bg-red">出库数量(吨):<span style="color: red;">*</span></label>
370 393
 												</th>
371
-												<th width='15%'>
394
+												<th width='15%' ng-show="productEdit.zylx==1">
372 395
 													<label class="input">
373 396
 														<i class="input"></i>
374
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople" />
397
+														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity"
398
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' "
399
+															   required />
375 400
 													</label>
376 401
 												</th>
377
-												<th></th>
378
-												<th></th>
379
-												<th></th>
380
-												<th></th>
381 402
 											</tr>
382 403
 											<tr>
383 404
 												<th width='15%'>

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

@@ -26,7 +26,14 @@
26 26
 											</a>&emsp;
27 27
 											<label>仓房/油罐名称:
28 28
 												<select ng-model="search.houseId" class="form-control input-sm"
29
-                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list">
29
+                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list"
30
+                                                        ng-change="loadWare(search.houseId)">
31
+                                                    <option value="">请选择</option>
32
+                                                </select>&emsp;
33
+											</label>
34
+											<label>货位名称:
35
+												<select ng-model="search.wareId" class="form-control input-sm"
36
+                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
30 37
                                                     <option value="">请选择</option>
31 38
                                                 </select>&emsp;
32 39
 											</label>
@@ -62,6 +69,7 @@
62 69
 											<th data-class="expand" style="text-align:center;">仓房/油罐名称</th>
63 70
 											<th data-class="expand" style="text-align:center;">货位名称</th>
64 71
 											<th data-class="expand" style="text-align:center;">粮油品种</th>
72
+											<th data-class="expand" style="text-align:center;">明细品种</th>
65 73
 											<th data-class="expand" style="text-align:center;">粮油性质</th>
66 74
 											<th data-class="expand" style="text-align:center;">粮油等级</th>
67 75
 											<th data-class="expand" style="text-align:center;">入库数量(吨)</th>
@@ -77,6 +85,7 @@
77 85
 											<td style="text-align:center;">{{storehouseObj[product.houseId].storehouseName}}</td>
78 86
 											<td style="text-align:center;">{{warehouseObj[product.warehouseId].warehouseName}}</td>
79 87
 											<td style="text-align:center;">{{dicData[product.lspz]}}</td>
88
+											<td style="text-align:center;">{{dicData[product.lsmxpz]}}</td>
80 89
 											<td style="text-align:center;">{{dicData[product.nature]}}</td>
81 90
 											<td style="text-align:center;">{{dicData[product.levels]}}</td>
82 91
 											<td style="text-align:center;">{{product.storageQuantity}}</td>

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

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

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

@@ -81,7 +81,7 @@
81 81
 											</section>
82 82
 
83 83
 											<section class="col col-3">
84
-												<label class="label">入仓日期:<span style="color: red;">*</span></label>
84
+												<label class="label">入仓日期(第一车):<span style="color: red;">*</span></label>
85 85
 												<label class="input">
86 86
 													<input type="text" ng-model="qualitycheck.inputTime" ng-disabled="true" placeholder="入仓日期" required>
87 87
 												</label>
@@ -90,6 +90,13 @@
90 90
 
91 91
 										<div class="row">
92 92
 											<section class="col col-3">
93
+												<label class="label">入库日期(最后一车):<span style="color: red;">*</span></label>
94
+												<label class="input">
95
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
96
+														   placeholder="入库日期" required>
97
+												</label>
98
+											</section>
99
+											<section class="col col-3">
93 100
 												<label class="label">保管员:<span style="color: red;">*</span></label>
94 101
 												<label class="input">
95 102
 													<input type="text" ng-model="qualitycheck.keeper" placeholder="保管员" ng-disabled="true" required>
@@ -885,7 +892,7 @@
885 892
 														<td class="text-center" colspan="3">黄粒米%</td>
886 893
 														<td class="text-center" colspan="2">
887 894
 															<label class="input">
888
-																<input type="text" ng-model="qualitycheckInspection.yellowPart" name="yellowPart" ng-readonly="isNotEdit">
895
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
889 896
 															</label>
890 897
 														</td>
891 898
 													</tr>
@@ -1232,7 +1239,7 @@
1232 1239
 														<td class="text-center" colspan="3">黄粒米%</td>
1233 1240
 														<td class="text-center" colspan="2">
1234 1241
 															<label class="input">
1235
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1242
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1236 1243
 															</label>
1237 1244
 														</td>
1238 1245
 													</tr>
@@ -1965,7 +1972,7 @@
1965 1972
 						</td>
1966 1973
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
1967 1974
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
1968
-							{{qualitycheckInspection.yellowPart}}
1975
+							{{qualitycheckInspection.yellowRice}}
1969 1976
 						</td>
1970 1977
 					</tr>
1971 1978
 					<tr>
@@ -2238,7 +2245,7 @@
2238 2245
 						</td>
2239 2246
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
2240 2247
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2241
-							{{qualitycheck.yellowRice}}
2248
+							{{qualitycheckInspection.yellowRice}}
2242 2249
 						</td>
2243 2250
 					</tr>
2244 2251
 					<tr>

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

@@ -131,7 +131,7 @@
131 131
 											</section>
132 132
 
133 133
 											<section class="col col-3">
134
-												<label class="label">入仓日期:<span style="color: red;">*</span></label>
134
+												<label class="label">入仓日期(第一车):<span style="color: red;">*</span></label>
135 135
 												<label class="input">
136 136
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
137 137
 														   placeholder="入仓日期" required>
@@ -140,6 +140,13 @@
140 140
 										</div>
141 141
 
142 142
 										<div class="row">
143
+										    <section class="col col-3">
144
+												<label class="label">入库日期(最后一车):<span style="color: red;">*</span></label>
145
+												<label class="input">
146
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
147
+														   placeholder="入库日期" required>
148
+												</label>
149
+											</section>
143 150
 											<section class="col col-3">
144 151
 												<label class="label">检验类型:<span style="color: red;">*</span></label>
145 152
 												<label class="select">
@@ -515,7 +522,7 @@
515 522
 														</td>
516 523
 														<td>
517 524
 															<label class="input">
518
-																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
525
+																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
519 526
 															</label>
520 527
 														</td>
521 528
 														<td colspan="2" class="text-center">生芽粒%</td>
@@ -1008,7 +1015,7 @@
1008 1015
 														<td class="text-center" colspan="3">黄粒米%</td>
1009 1016
 														<td class="text-center" colspan="2">
1010 1017
 															<label class="input">
1011
-																<input type="text" ng-model="qualitycheck.yellowPart" name="yellowPart" ng-blur="zjzl()" ng-readonly="isNotEdit">
1018
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-blur="zjzl()" ng-readonly="isNotEdit">
1012 1019
 															</label>
1013 1020
 														</td>
1014 1021
 													</tr>
@@ -2318,7 +2325,7 @@
2318 2325
 						</td>
2319 2326
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
2320 2327
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2321
-							{{qualitycheck.yellowPart}}
2328
+							{{qualitycheckInspection.yellowRice}}
2322 2329
 						</td>
2323 2330
 					</tr>
2324 2331
 					<tr>

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

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

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

@@ -131,7 +131,7 @@
131 131
 											</section>
132 132
 
133 133
 											<section class="col col-3">
134
-												<label class="label">入仓日期:<span style="color: red;">*</span></label>
134
+												<label class="label">入仓日期(第一车):<span style="color: red;">*</span></label>
135 135
 												<label class="input">
136 136
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
137 137
 														   placeholder="入仓日期" required>
@@ -141,6 +141,13 @@
141 141
 
142 142
 										<div class="row">
143 143
 											<section class="col col-3">
144
+												<label class="label">入库日期(最后一车):<span style="color: red;">*</span></label>
145
+												<label class="input">
146
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
147
+														   placeholder="入库日期" required>
148
+												</label>
149
+											</section>
150
+											<section class="col col-3">
144 151
 												<label class="label">保管员:<span style="color: red;">*</span></label>
145 152
 												<label class="input">
146 153
 													<input type="text" ng-model="qualitycheck.keeper" ng-disabled="isNotEdit" name="keeper" placeholder="保管员" required>
@@ -505,7 +512,7 @@
505 512
 														</td>
506 513
 														<td>
507 514
 															<label class="input">
508
-																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
515
+																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
509 516
 															</label>
510 517
 														</td>
511 518
 														<td colspan="2" class="text-center">生芽粒%</td>
@@ -989,7 +996,7 @@
989 996
 														<td class="text-center" colspan="2">黄粒米%</td>
990 997
 														<td class="text-center" colspan="1">
991 998
 															<label class="input">
992
-																<input type="text" ng-model="qualitycheckInspection.yellowPart" name="yellowPart" ng-blur="zjzl()" ng-readonly="isNotEdit">
999
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-blur="zjzl()" ng-readonly="isNotEdit">
993 1000
 															</label>
994 1001
 														</td>
995 1002
 														<td colspan="2" class="text-center">互混率%</td>
@@ -1346,7 +1353,7 @@
1346 1353
 														<td class="text-center" colspan="3">黄粒米%</td>
1347 1354
 														<td class="text-center" colspan="2">
1348 1355
 															<label class="input">
1349
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1356
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1350 1357
 															</label>
1351 1358
 														</td>
1352 1359
 													</tr>
@@ -2137,7 +2144,7 @@
2137 2144
 						</td>
2138 2145
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
2139 2146
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2140
-							{{qualitycheckInspection.yellowPart}}
2147
+							{{qualitycheckInspection.yellowRice}}
2141 2148
 						</td>
2142 2149
 					</tr>
2143 2150
 					<tr>
@@ -2410,7 +2417,7 @@
2410 2417
 						</td>
2411 2418
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
2412 2419
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2413
-							{{qualitycheck.yellowRice}}
2420
+							{{qualitycheckInspection.yellowRice}}
2414 2421
 						</td>
2415 2422
 					</tr>
2416 2423
 					<tr>

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

@@ -131,7 +131,7 @@
131 131
 											</section>
132 132
 
133 133
 											<section class="col col-3">
134
-												<label class="label">入仓日期:<span style="color: red;">*</span></label>
134
+												<label class="label">入仓日期(第一车):<span style="color: red;">*</span></label>
135 135
 												<label class="input">
136 136
 													<input type="text" ng-model="qualitycheck.inputTime" name="inputTime" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
137 137
 														   placeholder="入仓日期" required>
@@ -141,6 +141,13 @@
141 141
 
142 142
 										<div class="row">
143 143
 											<section class="col col-3">
144
+												<label class="label">入库日期(最后一车):<span style="color: red;">*</span></label>
145
+												<label class="input">
146
+													<input type="text" ng-model="qualitycheck.zhycsj" name="zhycsj" onClick="WdatePicker({lang:'zh-cn'})" ng-disabled="isShow"
147
+														   placeholder="入库日期" required>
148
+												</label>
149
+											</section>
150
+											<section class="col col-3">
144 151
 												<label class="label">检验类型:<span style="color: red;">*</span></label>
145 152
 												<label class="select">
146 153
 													<select name="type" ng-model="qualitycheck.type" ng-disabled="isNotEdit" required>
@@ -1396,7 +1403,7 @@
1396 1403
 														<td class="text-center" colspan="3">黄粒米%</td>
1397 1404
 														<td class="text-center" colspan="2">
1398 1405
 															<label class="input">
1399
-																<input type="text" ng-model="qualitycheck.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1406
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
1400 1407
 															</label>
1401 1408
 														</td>
1402 1409
 													</tr>
@@ -2549,7 +2556,7 @@
2549 2556
 						</td>
2550 2557
 						<td colspan="3" style="vertical-align: middle;text-align: center;">黄粒米%</td>
2551 2558
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2552
-							{{qualitycheck.yellowRice}}
2559
+							{{qualitycheckInspection.yellowRice}}
2553 2560
 						</td>
2554 2561
 					</tr>
2555 2562
 					<tr>

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

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