虫害检查-修改

src/main/resources/static/app/storage/insectPestDetection/controller/insectPestDetectionNewCtrl.js

@@ -276,7 +276,7 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
     };
 })
 // 虫害手工录入
-.controller("insectPestEditNewCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionNewService, warehouseService) {
+.controller("insectPestEditNewCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionNewService, warehouseService, pageListService) {
 
     // 仓房列表
     $scope.loadWare = function(houseId) {
@@ -287,6 +287,16 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
         });
     };
 
+    // 获取库存信息
+    $scope.getStorageInfo = function(warehouseId) {
+        insectPestDetectionNewService.getCheckGrainAttribute($rootScope.orgInfo.orgId, $scope.houseId, warehouseId).then(function(data){
+            $scope.insectPests.lypz = data.data.lypz;
+            $scope.insectPests.kcsl = data.data.kcsl;
+        },function(data){
+            console.log(data);
+        });
+    };
+
     $scope.isEdit = false;
 
     if ($stateParams.id != "0") {
@@ -296,6 +306,7 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
             $scope.houseId = $rootScope.storeHouseCodeObj[data.data.vCcCode].storehouseId;
             $scope.insectPests.vHwCode = parseInt(data.data.vHwCode);
             $scope.insectPests.cldjpd = parseInt(data.data.cldjpd);
+            $scope.insectPests.hcjcdh = $scope.insectPests.hcjcdh.substr(-12);
             $scope.pestList = [];
             if (data.data != "error") {
                 var hczl = data.data.hczl;
@@ -323,6 +334,8 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
         $scope.saveFlag = false;
         $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
         $scope.insectPests.orgId = $rootScope.orgInfo.orgId;
+        $scope.insectPests.commitPeople = $rootScope.userInfo.realName;
+        $scope.insectPests.commitTime = $filter('date')(new Date(), "yyyy-MM-dd hh:mm:ss");
     }
 
     var validator = $("#insectPests-form").validate();

src/main/resources/static/app/storage/insectPestDetection/service/insectPestDetectionNewService.js

@@ -144,4 +144,20 @@ angular.module('app.storage').service("insectPestDetectionNewService", function(
         return d.promise;
     };
 
+    // 获取粮食品种,库存数量(吨)
+    this.getCheckGrainAttribute = function (orgId, houseId, warehouseId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.qualitycheckUrl + '/intelligents/insectPestDetection/getCheckGrainAttribute/' + orgId + '/' + houseId + '/' + warehouseId
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
 });

src/main/resources/static/app/storage/insectPestDetection/view/insectPestDetection-edit.html

@@ -44,7 +44,7 @@
 											<th width='15%'>
 												<label class="select">
 													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm" ng-disabled="isEdit"
-															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required>
+															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" ng-change="getStorageInfo(insectPests.vHwCode)" required>
 														<option value="">请选择</option>
 													</select> <i></i>
 												</label>
@@ -80,7 +80,7 @@
 											<th>
 												<label class="input">
 													<input type="text" ng-model="insectPests.standTime" name="standTime" ng-disabled="isEdit"
-														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
 												</label>
 											</th>
 											<th >
@@ -115,21 +115,21 @@
 											<th>
 												<label class="input">
 													<input type="text" ng-model="insectPests.vUpdateTime" name="vUpdateTime" ng-disabled="isEdit"
-														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required/>
+														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required/>
 												</label>
 											</th>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">检测人</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">检测人<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.vUpdatePeople" ng-readonly="isEdit" />
+													<input type="text" ng-model="insectPests.vUpdatePeople" ng-readonly="isEdit" required/>
 												</label>
 											</th>
 										</tr>
 										<tr>
 											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">发生部位<span style="color: red;">*</span></label>
+												<label class="label" style="margin-top: 9px;text-align: center;">发生部位<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>
@@ -139,10 +139,48 @@
 													</label>
 												</section>
 											</th>
-											<th></th>
-											<th></th>
-											<th></th>
-											<th></th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">粮油品种</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="dicData[insectPests.lypz]" ng-readonly="true" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="insectPests.kcsl" ng-readonly="true" />
+												</label>
+											</th>
+										</tr>
+										<tr>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">提交人</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="insectPests.commitPeople" ng-readonly="true" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">提交时间</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="insectPests.commitTime" ng-readonly="true" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">虫害检测单号</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" placeholder="自动生成 检测日期(yyyyMMdd)+4 位顺序号" ng-model="insectPests.hcjcdh" ng-readonly="true" />
+												</label>
+											</th>
 										</tr>
 									</table>
 								</fieldset>

src/main/resources/static/app/storage/insectPestDetection/view/insectPestDetection-list.html

@@ -73,7 +73,7 @@
                                         <td style="text-align:center;">{{ storeHouseCodeObj[insectPest.vCcCode].storehouseName }}</td>
                                         <td style="text-align:center;">{{ wares[insectPest.vHwCode].warehouseName }}</td>
                                         <td style="text-align:center;">{{ insectPest.standOr }}</td>
-                                        <td style="text-align:center;">{{ insectPest.standTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                                        <td style="text-align:center;">{{ insectPest.standTime | date:'yyyy-MM-dd' }}</td>
                                         <!-- <td style="text-align:center;">{{ insectPest.itdh }}</td> -->
                                         <td style="text-align:center;">
                                             <span ng-repeat="cIns in insectPest.hczl.split('#') track by $index">
@@ -88,11 +88,11 @@
                                             </span>&nbsp;
                                         </td>
                                         <td style="text-align:center;">{{ insectPest.vUpdatePeople }}</td>
-                                        <td style="text-align:center;">{{ insectPest.vUpdateTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                                        <td style="text-align:center;">{{ insectPest.vUpdateTime | date:'yyyy-MM-dd' }}</td>
                                         <td style="text-align:center;">
                                             <!-- <a ng-hide="isArchive" ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vcfcode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vcfcode].storehouseName}}检测</a> -->
                                             <a ng-hide="isArchive" href-void ng-click="edit(insectPest.id, 'view')"><i class=""></i>查看</a>
-                                            <a ng-hide="isArchive" href-void ng-click="edit(insectPest.id, 'update')"><i class=""></i>修改</a>
+                                            <!--<a ng-hide="isArchive" href-void ng-click="edit(insectPest.id, 'update')"><i class=""></i>修改</a>-->
                                         </td>
                                     </tr>
                                     </tbody>