MoBileController.java
14.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
package com.huaheng.api.mobile.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.huaheng.api.mobile.InventorySurvey;
import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.support.Convert;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.api.acs.service.AcsService;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
import com.huaheng.pc.inventory.InventoryMaterialSummary.service.InventoryMaterialSummaryService;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/API/mobile")
public class MoBileController extends BaseController {
@Resource
private TaskHeaderService
taskHeaderService;
@Resource
private TaskDetailService
taskDetailService;
@Resource
private InventoryHeaderService
inventoryHeaderService;
@Resource
private InventoryDetailService
inventoryDetailService;
@Resource
private InventoryMaterialSummaryService
inventoryMaterialSummaryService;
@Resource
private MaterialService materialService;
@Resource
private AcsService
acsService;
/**
* 入库任务建立
*/
@Log(title = "入库任务建立", action = BusinessType.UPDATE)
@PostMapping("/addReceiptTask")
@ApiOperation("入库任务建立")
@ResponseBody
public AjaxResult addReceiptTask(@RequestBody HashMap<String,Object> map)
{
String containerCode = String.valueOf(map.get("containerCode"));
List<TaskDetail> taskDetails = JSONObject.parseArray(JSON.toJSONString(map.get("taskDetails")),TaskDetail.class);
AjaxResult ajaxResult = taskHeaderService.addTaskHeader(containerCode,"mobile","");
if(ajaxResult.hasErr()){
return ajaxResult;
}
String taskId =JSON.toJSONString(ajaxResult.getData());
if(!taskDetails.isEmpty()) {
for (TaskDetail item : taskDetails) {
item.setTaskId(Integer.valueOf(taskId));
ajaxResult = taskDetailService.addRDetail(item);
}
}
ajaxResult =taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
ajaxResult.setData("");
return ajaxResult;
}
/**
* 库存明细查看
*/
@Log(title = "库存明细查看", action = BusinessType.UPDATE)
@PostMapping("/inventoryList")
@ApiOperation("库存明细查看")
@ResponseBody
public AjaxResult inventoryList(@RequestBody InventoryDetail inventoryDetail)
{
LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
PageDomain
pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
lambdaQueryWrapper//仓库
.eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID
.eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
.eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
.eq(StringUtils.isNotEmpty(inventoryDetail.getSupplierCode()),InventoryDetail::getSupplierCode,inventoryDetail.getSupplierCode())//供应商
.eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
.like(StringUtils.isNotEmpty(inventoryDetail.getMaterialName()),InventoryDetail::getMaterialName,inventoryDetail.getMaterialName())//物料名称
.like(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()),InventoryDetail::getMaterialSpec,inventoryDetail.getMaterialSpec())//物料规格
.eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
.eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
.eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
.eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
.eq(StringUtils.isNotEmpty(inventoryDetail.getReceiptCode()),InventoryDetail::getReceiptCode,inventoryDetail.getReceiptCode())//入库单编码
.eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
.eq(StringUtils.isNotEmpty(inventoryDetail.getReferCode()),InventoryDetail::getReferCode,inventoryDetail.getReferCode())//上游单号
.eq(StringUtils.isNotEmpty(inventoryDetail.getReferDetailId()),InventoryDetail::getReferDetailId,inventoryDetail.getReferDetailId())//上游行号
.eq(StringUtils.isNotEmpty(inventoryDetail.getLockCode()),InventoryDetail::getLockCode,inventoryDetail.getLockCode())//库存锁
//货主
.orderByDesc(InventoryDetail::getId);
//
// if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
// //分页查询
// Page<InventoryDetail>
// page = new Page<>(pageNum, pageSize);
// IPage<InventoryDetail>
// iPage = inventoryDetailService.page(page, lambdaQueryWrapper);
// return getMpDataTable(iPage.getRecords(),iPage.getTotal());
// } else {
List<InventoryDetail> inventories = inventoryDetailService.list(lambdaQueryWrapper);
List<InventorySurvey> inventorySurveys = new ArrayList<>();
List<String> materials= new ArrayList<>();
for(InventoryDetail inventory1 :inventories) {
materials.add(inventory1.getMaterialCode());
}
String[] str = materials.toArray(new String[materials.size()]);
List<Material> materialList = null;
if(str != null && str.length > 0) {
materialList = materialService.selectNameByListcode(str);
}
for(InventoryDetail inventory1 : inventories) {
boolean add = true;
int index = -1;
InventorySurvey inventorySurvey2 = null;
if(inventorySurveys != null && inventorySurveys.size() > 0) {
for (InventorySurvey inventorySurvey : inventorySurveys) {
index++;
if (inventory1.getMaterialCode() != null) {
if (inventorySurvey.getMaterialCode().equals(inventory1.getMaterialCode())) {
add = false;
inventorySurvey2 = inventorySurvey;
}
}
}
}
if(add) {
InventorySurvey inventorySurvey = new InventorySurvey();
inventorySurvey.setMaterialCode(inventory1.getMaterialCode());
String materialName = null;
for (Material material1 : materialList) {
if (material1.getCode().equals(inventory1.getMaterialCode())){
materialName = material1.getName();
break;
}
}
if(materialName != null) {
inventorySurvey.setMaterialName(materialName);
}
inventorySurvey.setQty(inventory1.getQty());
inventorySurveys.add(inventorySurvey);
} else {
inventorySurveys.remove(inventorySurvey2);
BigDecimal qty = inventorySurvey2.getQty().add(inventory1.getQty());
inventorySurvey2.setQty(qty);
inventorySurveys.add(index, inventorySurvey2);
}
}
return AjaxResult.success(inventorySurveys);
// }
}
@PostMapping("/getInventoryDetails")
@ApiOperation("移动端获取库存详情")
@Log(title = "移动端获取库存详情", action = BusinessType.OTHER)
public AjaxResult getInventoryDetails(@RequestBody Map<String, String> param) {
if (param.get("code") == null || param.get("code").trim().length() < 1)
throw new JSONException("物料号号不能为空");
String materialCode = param.get("code");
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, materialCode);
List<InventoryDetail> inventories = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
if(inventories == null) {
return AjaxResult.error("查询该物料库存信息失败");
}
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
materialLambdaQueryWrapper.eq(Material::getCode, materialCode);
Material material = materialService.getOne(materialLambdaQueryWrapper);
if(material != null) {
for (InventoryDetail inventory1 : inventories) {
inventory1.setMaterialName(material.getName());
}
}
return AjaxResult.success(inventories);
}
// /**
// * 相同物料数量汇总查看
// */
// @Log(title = "相同物料数量汇总查看", action = BusinessType.UPDATE)
// @PostMapping("/inventoryMaterialSummary")
// @ApiOperation("相同物料数量汇总查看")
// @ResponseBody
// @ApiLogger(apiName = "相同物料数量汇总查看", from="mobile")
// public AjaxResult inventoryMaterialSummary(@RequestBody HashMap<String,Object> map)
// {
// return acsService.TaskConfirm(map);
// }
/**
* 出库任务建立
*/
@Log(title = "出库任务建立", action = BusinessType.UPDATE)
@PostMapping("/addShipmentTask")
@ApiOperation("出库任务建立")
@ResponseBody
public AjaxResult addShipmentTask(@RequestBody HashMap<String,Object> map)
{
AjaxResult ajaxResult = new AjaxResult();
String json = JSON.toJSONString(map);
// logger.info("AGV完成数据：{}",json);
String ids = String.valueOf(map.get("ids"));
if( StringUtils.isNull(map.get("qty"))){
ajaxResult = inventoryHeaderService.ships(java.util.Arrays.asList(ids.split(",")),"mobile");
}else {
ajaxResult = inventoryHeaderService.ship(ids,new BigDecimal(String.valueOf(map.get("qty"))),"mobile");
}
if(ajaxResult.hasErr()){
return ajaxResult;
}else {
List<Integer> taskIds = JSON.parseObject(JSON.toJSONString(ajaxResult.getData()), ArrayList.class);
if(!taskIds.isEmpty()){
Integer[] id = new Integer[taskIds.size()];
ajaxResult =taskHeaderService.sendTaskToWcs(taskIds.toArray(id));
}
}
ajaxResult.setData("");
return ajaxResult;
}
@Log(title = "AGV呼叫", action = BusinessType.UPDATE)
@PostMapping("/callCar")
@ApiOperation("AGV呼叫")
@ResponseBody
public AjaxResult callCar()
{
return acsService.callCar();
}
/**
* AGV行走
*/
@Log(title = "AGV行走", action = BusinessType.UPDATE)
@PostMapping("/taskPPW")
@ApiOperation("AGV行走")
@ResponseBody
public AjaxResult taskPPW()
{
AjaxResult ajaxResult = new AjaxResult();
//获取状态为到达取货点任务
LambdaQueryWrapper<TaskHeader> taskHeaderLambda = Wrappers.lambdaQuery();
taskHeaderLambda.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_APP);
List<TaskHeader> taskHeaders = taskHeaderService.list(taskHeaderLambda);
if(taskHeaders.isEmpty()){
return AjaxResult.success("没有可行走的任务");
}
for (TaskHeader item : taskHeaders) {
ajaxResult = acsService.WalkingTask(item.getId());
}
return ajaxResult;
}
/**
* AGV回库
*/
@Log(title = "AGV回库", action = BusinessType.UPDATE)
@PostMapping("/taskRPB")
@ApiOperation("AGV回库")
@ResponseBody
public AjaxResult TaskRPB()
{
AjaxResult ajaxResult = new AjaxResult();
//获取状态为到达取货点任务
LambdaQueryWrapper<TaskHeader> taskHeaderLambda = Wrappers.lambdaQuery();
taskHeaderLambda.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_ARP);
List<TaskHeader> taskHeaders = taskHeaderService.list(taskHeaderLambda);
if(taskHeaders.isEmpty()){
return AjaxResult.success("没有可回库的任务");
}
for (TaskHeader item : taskHeaders) {
ajaxResult = acsService.ReceiptTask(item.getId());
}
return ajaxResult;
}
}