|
|
@@ -1,195 +1,209 @@
|
|
1
|
1
|
"use strict";
|
|
2
|
2
|
// 已入库为源头追溯列表
|
|
3
|
|
-angular.module('app.synth').controller("warehouseSourceCtrl",function ($scope, $rootScope, $state, $filter,
|
|
4
|
|
- warehouseService, fcbgzService) {
|
|
|
3
|
+angular.module('app.synth').controller("warehouseSourceCtrl", function ($scope, $rootScope, $state, $filter,
|
|
|
4
|
+ warehouseService, fcbgzService) {
|
|
5
|
5
|
|
|
6
|
6
|
// 获取基础数据
|
|
7
|
|
- $scope.getBasicData = function() {
|
|
|
7
|
+ $scope.getBasicData = function () {
|
|
8
|
8
|
//按照单位获取单位下的仓房信息
|
|
9
|
9
|
var depotId = $rootScope.orgInfo.orgId;
|
|
10
|
10
|
//获取货位信息
|
|
11
|
11
|
var cfh = '';
|
|
12
|
|
- warehouseService.getStorehouse(depotId, cfh, "0").then(function(data){
|
|
|
12
|
+ warehouseService.getStorehouse(depotId, cfh, "0").then(function (data) {
|
|
13
|
13
|
$scope.warelist = data.wareList; //下拉列表数据
|
|
14
|
14
|
$scope.warehouseObj = data.wares; //查询数据列表货位信息转换
|
|
15
|
|
- },function (data) {
|
|
|
15
|
+ }, function (data) {
|
|
16
|
16
|
console.log(data);
|
|
17
|
17
|
});
|
|
18
|
18
|
}
|
|
19
|
|
-
|
|
|
19
|
+
|
|
20
|
20
|
//根据仓房获取货位列表
|
|
21
|
|
- $scope.getWareList = function(houseId) {
|
|
|
21
|
+ $scope.getWareList = function (houseId) {
|
|
22
|
22
|
//按照单位获取单位下的仓房信息
|
|
23
|
23
|
var depotId = $rootScope.orgInfo.orgId;
|
|
24
|
|
- warehouseService.getStorehouse(depotId, houseId, "0").then(function(data){
|
|
|
24
|
+ warehouseService.getStorehouse(depotId, houseId, "0").then(function (data) {
|
|
25
|
25
|
$scope.warelist = data.wareList; //下拉列表数据
|
|
26
|
|
- },function (data) {
|
|
|
26
|
+ }, function (data) {
|
|
27
|
27
|
console.log(data);
|
|
28
|
28
|
});
|
|
29
|
29
|
}
|
|
30
|
30
|
|
|
31
|
31
|
//初始化加载
|
|
32
|
|
- $scope.pageInfo = {pageNum : 1, pageSize : 10};
|
|
33
|
|
- $scope.loadData = function() {
|
|
34
|
|
- fcbgzService.queryRkZsList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,
|
|
35
|
|
- $rootScope.orgInfo.orgId, $scope.storehouseId, $scope.wareId).then(function(data){
|
|
36
|
|
- $scope.pageInfo = data;
|
|
37
|
|
- },function(data){
|
|
38
|
|
- console.log(data);
|
|
39
|
|
- });
|
|
40
|
|
- }
|
|
|
32
|
+ $scope.pageInfo = { pageNum: 1, pageSize: 10 };
|
|
|
33
|
+ $scope.loadData = function () {
|
|
|
34
|
+ fcbgzService.queryRkZsList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,
|
|
|
35
|
+ $rootScope.orgInfo.orgId, $scope.storehouseId, $scope.wareId).then(function (data) {
|
|
|
36
|
+ $scope.pageInfo = data;
|
|
|
37
|
+ }, function (data) {
|
|
|
38
|
+ console.log(data);
|
|
|
39
|
+ });
|
|
|
40
|
+ }
|
|
41
|
41
|
|
|
42
|
42
|
//初始化加载
|
|
43
|
43
|
$scope.loadData();
|
|
44
|
44
|
$scope.getBasicData();
|
|
45
|
45
|
|
|
46
|
46
|
// 翻页
|
|
47
|
|
- $scope.goPage = function(pageNum) {
|
|
48
|
|
- if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
|
|
49
|
|
- $scope.pageInfo.pageNum = pageNum;
|
|
50
|
|
- $scope.loadData();
|
|
51
|
|
- }
|
|
52
|
|
- }
|
|
|
47
|
+ $scope.goPage = function (pageNum) {
|
|
|
48
|
+ if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
|
|
|
49
|
+ $scope.pageInfo.pageNum = pageNum;
|
|
|
50
|
+ $scope.loadData();
|
|
|
51
|
+ }
|
|
|
52
|
+ }
|
|
53
|
53
|
|
|
54
|
|
- // 查看、粮情信息、作业记录、质检信息
|
|
55
|
|
- $scope.view = function(obj, btnType) {
|
|
56
|
|
- if (btnType == 1) {
|
|
57
|
|
- $state.go('app.synth.warehouseSource.view',{fcbgz:angular.toJson(obj), btnType:btnType});
|
|
58
|
|
- } else if (btnType == 2) {
|
|
59
|
|
- //获取化验数据
|
|
60
|
|
- fcbgzService.queryCrkJyxx(obj.dataid).then(function(data){
|
|
61
|
|
- $scope.zjxx_list = data.zjxx;
|
|
62
|
|
- if (null != $scope.zjxx_list) {
|
|
63
|
|
- // 构建组织等级
|
|
64
|
|
- $scope.fillLevel(data.parentId, 0);
|
|
65
|
|
- // 构建树表格
|
|
66
|
|
- $scope.drawTable();
|
|
67
|
|
- }
|
|
68
|
|
- },function(data){
|
|
69
|
|
- console.log(data);
|
|
70
|
|
- });
|
|
|
54
|
+ // 查看、粮情信息、作业记录、质检信息
|
|
|
55
|
+ $scope.view = function (obj, btnType) {
|
|
|
56
|
+ if (btnType == 1) {
|
|
|
57
|
+ $state.go('app.synth.warehouseSource.view', { fcbgz: angular.toJson(obj), btnType: btnType });
|
|
|
58
|
+ } else if (btnType == 2) {
|
|
|
59
|
+ //获取化验数据
|
|
|
60
|
+ fcbgzService.queryCrkJyxx(obj.dataid).then(function (data) {
|
|
|
61
|
+ $scope.zjxx_list = data.zjxx;
|
|
|
62
|
+ if (null != $scope.zjxx_list) {
|
|
|
63
|
+ // 构建组织等级
|
|
|
64
|
+ $scope.fillLevel(data.parentId, 0);
|
|
|
65
|
+ // 构建树表格
|
|
|
66
|
+ $scope.drawTable();
|
|
|
67
|
+ }
|
|
|
68
|
+ }, function (data) {
|
|
|
69
|
+ console.log(data);
|
|
|
70
|
+ });
|
|
71
|
71
|
|
|
72
|
|
- // 显示弹出层
|
|
73
|
|
- $("#jyxxDetail_Model").modal("show");
|
|
|
72
|
+ // 显示弹出层
|
|
|
73
|
+ $("#jyxxDetail_Model").modal("show");
|
|
74
|
74
|
|
|
75
|
|
- } else if (btnType == 3) {
|
|
76
|
|
- var ch = $rootScope.storehouseObj[parseInt(obj.ch)].storehouseCode;
|
|
77
|
|
- $state.go('app.storage.safeproduce.safeCheck.ttplist',{houseId:ch});
|
|
78
|
|
- } else if (btnType == 4) {
|
|
79
|
|
- $state.go("app.supervise.operation.ccZy", {houseId: parseInt(obj.ch)});
|
|
80
|
|
- } else if (btnType == 123) {// 演示新增
|
|
81
|
|
- $state.go("app.synth.warehouseSource1.view", {houseId: parseInt(obj.ch)});
|
|
82
|
|
- }
|
|
83
|
|
- }
|
|
|
75
|
+ } else if (btnType == 3) {
|
|
|
76
|
+ var ch = $rootScope.storehouseObj[parseInt(obj.ch)].storehouseCode;
|
|
|
77
|
+ $state.go('app.storage.safeproduce.safeCheck.ttplist', { houseId: ch });
|
|
|
78
|
+ } else if (btnType == 4) {
|
|
|
79
|
+ $state.go("app.supervise.operation.ccZy", { houseId: parseInt(obj.ch) });
|
|
|
80
|
+ } else if (btnType == 123) {// 演示新增
|
|
|
81
|
+ $state.go("app.synth.warehouseSource1.view", { houseId: parseInt(obj.ch) });
|
|
|
82
|
+ }
|
|
|
83
|
+ }
|
|
84
|
84
|
|
|
85
|
|
- // 通过递归给组织赋等级
|
|
86
|
|
- $scope.fillLevel = function(parentId, level) {
|
|
87
|
|
- angular.forEach($scope.zjxx_list, function(item, index) {
|
|
|
85
|
+ // 通过递归给组织赋等级
|
|
|
86
|
+ $scope.fillLevel = function (parentId, level) {
|
|
|
87
|
+ angular.forEach($scope.zjxx_list, function (item, index) {
|
|
88
|
88
|
if (item.parentid == parentId) {
|
|
89
|
89
|
item.level = level;
|
|
90
|
90
|
item.parentId = parentId;
|
|
91
|
|
- $scope.fillLevel(item.zbxmc, level+1);
|
|
|
91
|
+ $scope.fillLevel(item.zbxmc, level + 1);
|
|
92
|
92
|
}
|
|
93
|
93
|
})
|
|
94
|
94
|
}
|
|
95
|
95
|
|
|
96
|
96
|
// 生成表格树
|
|
97
|
|
- $scope.drawTable = function() {
|
|
|
97
|
+ $scope.drawTable = function () {
|
|
98
|
98
|
$("#tb").bootstrapTable('destroy');
|
|
99
|
99
|
$('#tb').bootstrapTable({
|
|
100
|
|
- data: $scope.zjxx_list, //数据源，必须包含parentId属性
|
|
101
|
|
- treeView: true,
|
|
102
|
|
- treeId: "zbxmc",
|
|
103
|
|
- treeField: "enumname",
|
|
104
|
|
- formatLoadingMessage: function () {
|
|
105
|
|
- return "";
|
|
106
|
|
- },
|
|
107
|
|
- columns: [{
|
|
108
|
|
- field: 'zbxmc',
|
|
109
|
|
- },{
|
|
110
|
|
- field: 'enumname',
|
|
111
|
|
- }, {
|
|
112
|
|
- field: 'jyz',
|
|
113
|
|
- },{
|
|
114
|
|
- field: 'jykl',
|
|
115
|
|
- },{
|
|
116
|
|
- field: 'jykj',
|
|
117
|
|
- }]
|
|
|
100
|
+ data: $scope.zjxx_list, //数据源，必须包含parentId属性
|
|
|
101
|
+ treeView: true,
|
|
|
102
|
+ treeId: "zbxmc",
|
|
|
103
|
+ treeField: "enumname",
|
|
|
104
|
+ formatLoadingMessage: function () {
|
|
|
105
|
+ return "";
|
|
|
106
|
+ },
|
|
|
107
|
+ columns: [{
|
|
|
108
|
+ field: 'zbxmc',
|
|
|
109
|
+ }, {
|
|
|
110
|
+ field: 'enumname',
|
|
|
111
|
+ }, {
|
|
|
112
|
+ field: 'jyz',
|
|
|
113
|
+ }, {
|
|
|
114
|
+ field: 'jykl',
|
|
|
115
|
+ }, {
|
|
|
116
|
+ field: 'jykj',
|
|
|
117
|
+ }]
|
|
118
|
118
|
})
|
|
119
|
119
|
}
|
|
120
|
120
|
})
|
|
121
|
|
-.controller("warehouseSourceViewCtrl",function ($scope, $rootScope, $state, $filter, $stateParams,
|
|
|
121
|
+ .controller("warehouseSourceViewCtrl", function ($scope, $rootScope, $state, $filter, $stateParams,
|
|
122
|
122
|
warehouseService, foodbasicinfoService, fcbgzService, enumService, threetempcheckService) {
|
|
123
|
123
|
|
|
124
|
|
- // 获取基础数据
|
|
125
|
|
- $scope.getBasicData = function() {
|
|
126
|
|
- //按照单位获取单位下的仓房信息
|
|
127
|
|
- var depotId = $rootScope.orgInfo.orgId;
|
|
128
|
|
- //获取货位信息
|
|
129
|
|
- var cfh = '';
|
|
130
|
|
- warehouseService.getStorehouse(depotId, cfh, '0').then(function(data){
|
|
131
|
|
- $scope.warelist = data.wareList; //下拉列表数据
|
|
132
|
|
- $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
|
|
133
|
|
- },function (data) {
|
|
134
|
|
- console.log(data);
|
|
135
|
|
- });
|
|
136
|
|
- }
|
|
|
124
|
+ // 获取基础数据
|
|
|
125
|
+ $scope.getBasicData = function () {
|
|
|
126
|
+ //按照单位获取单位下的仓房信息
|
|
|
127
|
+ var depotId = $rootScope.orgInfo.orgId;
|
|
|
128
|
+ //获取货位信息
|
|
|
129
|
+ var cfh = '';
|
|
|
130
|
+ warehouseService.getStorehouse(depotId, cfh, '0').then(function (data) {
|
|
|
131
|
+ $scope.warelist = data.wareList; //下拉列表数据
|
|
|
132
|
+ $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
|
|
|
133
|
+ }, function (data) {
|
|
|
134
|
+ console.log(data);
|
|
|
135
|
+ });
|
|
|
136
|
+ }
|
|
137
|
137
|
|
|
138
|
|
- $scope.data_add = function(data) {
|
|
139
|
|
- var e = [];
|
|
140
|
|
- if (data.length != 0) {
|
|
141
|
|
- //要插入的json对象串
|
|
142
|
|
- var a = {"id":null,"name":"请选择","children":[]};
|
|
143
|
|
- //将返回的json对象和要插入的json对象串转换为字符串格式
|
|
144
|
|
- var f = angular.toJson(a);
|
|
145
|
|
- var b = angular.toJson(data);
|
|
146
|
|
- //把要插入的json对象串插入返回数据的最前面
|
|
147
|
|
- var c = b.substring(0,1);
|
|
148
|
|
- var d = b.substring(1,b.length);
|
|
149
|
|
- e = c + f + "," + d;
|
|
150
|
|
- }
|
|
151
|
|
- //最后在转换为json对象返回去
|
|
152
|
|
- return angular.fromJson(e);
|
|
153
|
|
- }
|
|
|
138
|
+ $scope.data_add = function (data) {
|
|
|
139
|
+ var e = [];
|
|
|
140
|
+ if (data.length != 0) {
|
|
|
141
|
+ //要插入的json对象串
|
|
|
142
|
+ var a = { "id": null, "name": "请选择", "children": [] };
|
|
|
143
|
+ //将返回的json对象和要插入的json对象串转换为字符串格式
|
|
|
144
|
+ var f = angular.toJson(a);
|
|
|
145
|
+ var b = angular.toJson(data);
|
|
|
146
|
+ //把要插入的json对象串插入返回数据的最前面
|
|
|
147
|
+ var c = b.substring(0, 1);
|
|
|
148
|
+ var d = b.substring(1, b.length);
|
|
|
149
|
+ e = c + f + "," + d;
|
|
|
150
|
+ }
|
|
|
151
|
+ //最后在转换为json对象返回去
|
|
|
152
|
+ return angular.fromJson(e);
|
|
|
153
|
+ }
|
|
154
|
154
|
|
|
155
|
|
- //查看
|
|
156
|
|
- $scope.view = function() {
|
|
157
|
|
- $scope.getBasicData();
|
|
158
|
|
- var fcbgz = angular.fromJson($stateParams.fcbgz);
|
|
159
|
|
- fcbgzService.findByIdFcbgzData(fcbgz.dataid).then(function(data){
|
|
160
|
|
- $scope.foodbasicinfo = data.fcbgz;
|
|
161
|
|
- if ($scope.foodbasicinfo != undefined) {
|
|
162
|
|
- $scope.foodbasicinfo.houseId = $scope.foodbasicinfo.ch;
|
|
163
|
|
- $scope.foodbasicinfo.warehouseId = $scope.foodbasicinfo.hwh;
|
|
164
|
|
- $scope.foodbasicinfo.pz = parseInt($scope.foodbasicinfo.pz);
|
|
165
|
|
- $scope.foodbasicinfo.dj = parseInt($scope.foodbasicinfo.dj);
|
|
166
|
|
- $scope.foodbasicinfo.scnf = parseInt($scope.foodbasicinfo.scnf);
|
|
167
|
|
- $scope.foodbasicinfo.cjsj = $filter('date')($scope.foodbasicinfo.cjsj, "yyyy-MM-dd");
|
|
168
|
|
- $scope.foodbasicinfo.cd = $rootScope.dicData[$scope.foodbasicinfo.hwcd];
|
|
169
|
|
- //给下拉树赋值
|
|
170
|
|
- // 树形下拉框(粮食性质)
|
|
171
|
|
- enumService.getTreeListByTypeId($scope.foodbasicinfo.hwxz, 1032).then(function(data) {
|
|
172
|
|
- var data_new = $scope.data_add(data);
|
|
173
|
|
- $scope.lsxzTreeData = data_new;
|
|
174
|
|
- },function(data) {
|
|
175
|
|
- console.log(data);
|
|
176
|
|
- });
|
|
177
|
|
- }
|
|
178
|
|
- },function(data){
|
|
179
|
|
- console.log(data);
|
|
180
|
|
- });
|
|
181
|
|
- }
|
|
|
155
|
+ //查看
|
|
|
156
|
+ $scope.view = function () {
|
|
|
157
|
+ $scope.getBasicData();
|
|
|
158
|
+ var fcbgz = angular.fromJson($stateParams.fcbgz);
|
|
|
159
|
+ fcbgzService.findByIdFcbgzData(fcbgz.dataid).then(function (data) {
|
|
|
160
|
+ $scope.foodbasicinfo = data.fcbgz;
|
|
|
161
|
+ if ($scope.foodbasicinfo != undefined) {
|
|
|
162
|
+ $scope.foodbasicinfo.houseId = $scope.foodbasicinfo.ch;
|
|
|
163
|
+ $scope.foodbasicinfo.warehouseId = $scope.foodbasicinfo.hwh;
|
|
|
164
|
+ $scope.foodbasicinfo.pz = parseInt($scope.foodbasicinfo.pz);
|
|
|
165
|
+ $scope.foodbasicinfo.dj = parseInt($scope.foodbasicinfo.dj);
|
|
|
166
|
+ $scope.foodbasicinfo.scnf = parseInt($scope.foodbasicinfo.scnf);
|
|
|
167
|
+ $scope.foodbasicinfo.cjsj = $filter('date')($scope.foodbasicinfo.cjsj, "yyyy-MM-dd");
|
|
|
168
|
+ $scope.foodbasicinfo.cd = $rootScope.dicData[$scope.foodbasicinfo.hwcd];
|
|
|
169
|
+ //给下拉树赋值
|
|
|
170
|
+ // 树形下拉框(粮食性质)
|
|
|
171
|
+ enumService.getTreeListByTypeId($scope.foodbasicinfo.hwxz, 1032).then(function (data) {
|
|
|
172
|
+ var data_new = $scope.data_add(data);
|
|
|
173
|
+ $scope.lsxzTreeData = data_new;
|
|
|
174
|
+ }, function (data) {
|
|
|
175
|
+ console.log(data);
|
|
|
176
|
+ });
|
|
|
177
|
+ }
|
|
|
178
|
+ }, function (data) {
|
|
|
179
|
+ console.log(data);
|
|
|
180
|
+ });
|
|
|
181
|
+ }
|
|
182
|
182
|
|
|
183
|
|
- //返回、取消
|
|
184
|
|
- $scope.returnTop = function() {
|
|
185
|
|
- if ($rootScope.previousState_name != '') {
|
|
186
|
|
- $rootScope.back();
|
|
187
|
|
- } else {
|
|
188
|
|
- $state.go("app.synth.warehouseSource");
|
|
189
|
|
- }
|
|
190
|
|
- }
|
|
|
183
|
+ $scope.qualityEventView = function () {
|
|
|
184
|
+ $state.go("app.synth.qualityEventAnalysis.view");
|
|
|
185
|
+ }
|
|
|
186
|
+ $scope.dataWSD = function () {
|
|
|
187
|
+ $state.go("app.intelligent.grainDetection.humitureDetectionList");
|
|
|
188
|
+ }
|
|
|
189
|
+ // 成品粮油条码查看
|
|
|
190
|
+ $scope.pastBarcodeView = function () {
|
|
|
191
|
+ $state.go("app.synth.pastBarcode.view");
|
|
|
192
|
+ }
|
|
|
193
|
+ // 成品粮油条码编辑
|
|
|
194
|
+ $scope.pastBarcodeEdit = function () {
|
|
|
195
|
+ $state.go("app.synth.pastBarcode.edit");
|
|
|
196
|
+ }
|
|
|
197
|
+ //返回、取消
|
|
|
198
|
+ $scope.returnTop = function () {
|
|
|
199
|
+ if ($rootScope.previousState_name != '') {
|
|
|
200
|
+ $rootScope.back();
|
|
|
201
|
+ } else {
|
|
|
202
|
+ $state.go("app.synth.warehouseSource");
|
|
|
203
|
+ }
|
|
|
204
|
+ }
|
|
191
|
205
|
|
|
192
|
|
- if ($stateParams.btnType == 1) {
|
|
193
|
|
- $scope.view();
|
|
194
|
|
- }
|
|
195
|
|
-});
|
|
|
206
|
+ if ($stateParams.btnType == 1) {
|
|
|
207
|
+ $scope.view();
|
|
|
208
|
+ }
|
|
|
209
|
+ });
|
gypRoc
