MesController.java
12.2 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
package com.huaheng.api.mes.controller;
import com.huaheng.api.mes.domain.MesDomain;
import com.huaheng.api.mes.service.MesService;
import com.huaheng.api.wcs.domain.WcsTask;
import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @author 游杰
*/
@RestController
@RequestMapping("/API/WMS/v2")
public class MesController extends BaseController {
@Resource
private MesService mesService;
@PostMapping("/receipt")
@ApiOperation("入库")
@ResponseBody
public AjaxResult receipt(@RequestBody MesDomain mesDomain) {
AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.receipt(mesDomain);
return ajaxResult;
}
});
return ajaxResult;
}
@PostMapping("/shipment")
@ApiOperation("出库")
@ResponseBody
public AjaxResult shipment(@RequestBody MesDomain mesDomain) {
AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.shipment(mesDomain);
return ajaxResult;
}
});
return ajaxResult;
}
}
//=======
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.api.R;
//import com.huaheng.api.acs.service.AcsService;
//import com.huaheng.api.mes.domain.MesCallIn;
//import com.huaheng.common.constant.QuantityConstant;
//import com.huaheng.common.exception.service.ServiceException;
//import com.huaheng.common.utils.StringUtils;
//import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
//import com.huaheng.framework.web.domain.AjaxResult;
//import com.huaheng.mobile.receipt.ReceiptBill;
//import com.huaheng.pc.config.container.domain.Container;
//import com.huaheng.pc.config.container.service.ContainerService;
//import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
//import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
//import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
//import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderForShipmentService;
//import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
//import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
//import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerView;
//import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
//import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
//import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
//import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
//import com.huaheng.pc.task.agvTask.domain.AgvTask;
//import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
//import com.huaheng.pc.task.taskHeader.service.ReceiptTaskService;
//import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.web.bind.annotation.*;
//
//import javax.annotation.Resource;
//import java.math.BigDecimal;
//import java.text.SimpleDateFormat;
//import java.util.ArrayList;
//import java.util.Arrays;
//import java.util.List;
//import java.util.Map;
//import java.util.stream.Collectors;
//
//@RestController
//@RequestMapping("/API/WMS/v2")
//public class MesController {
//
// @Resource
// private ReceiptContainerHeaderService receiptContainerHeaderService;
// @Resource
// private ReceiptHeaderService receiptHeaderService;
// @Resource
// private ReceiptDetailService receiptDetailService;
// @Resource
// private ReceiptContainerDetailService receiptContainerDetailService;
// @Resource
// private ContainerService containerService;
// @Resource
// private InventoryDetailService inventoryDetailService;
// @Resource
// private InventoryHeaderService inventoryHeaderService;
// @Resource
// private TaskHeaderService taskHeaderService;
// @Resource
// private ReceiptTaskService receiptTaskService;
// @Resource
// private InventoryHeaderForShipmentService inventoryHeaderForShipmentService;
// @Resource
// private AcsService acsService;
//
//
// @PostMapping("/MesQuickReceipt")
// @ApiOperation("Mes入库")
// @ApiLogger(apiName = "Mes入库", from="ROBOT")
// @Transactional(rollbackFor = Exception.class)
// @ResponseBody
// public AjaxResult MesQuickReceipt(@RequestBody MesCallIn mesCallIn) {
// String materialCode=mesCallIn.getMaterialCode();
// String containerCode = mesCallIn.getContainerCode();
// String port = mesCallIn.getPort();
// String locationCode ="";
// String companyCode="BHF";
// if (StringUtils.isEmpty(materialCode)){
// return AjaxResult.error("物料信息不能为空");
// }
// if (StringUtils.isEmpty(containerCode)){
// return AjaxResult.error("容器号不能为空");
// }
// if (StringUtils.isEmpty(port)){
// return AjaxResult.error("站台不能为空");
// }
// LambdaQueryWrapper<Container> containerLambdaQueryWrapper= Wrappers.lambdaQuery();
// containerLambdaQueryWrapper.eq(Container::getCode,containerCode)
// .eq(Container::getWarehouseCode,"CS0001");
// Container one = containerService.getOne(containerLambdaQueryWrapper);
// if (one==null){
// return AjaxResult.error(containerCode+"容器不存在");
// }
// List<TaskHeader> unfinishTask = taskHeaderService.getUnCompleteTaskList().stream().filter((t) -> {
// return t.getContainerCode().equals(one.getCode());
// }).collect(Collectors.toList());
//
// if (unfinishTask.size() > 0) {
// TaskHeader t = unfinishTask.get(0);
// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(t.getCreated());
// throw new ServiceException(one.getCode() + "托盘已经有未完成的任务，请不要重复下发\n该托盘任务创建于：" + time);
// }
//
// List<ReceiptBill> receiptBills = new ArrayList<>();
// ReceiptBill receiptBill =new ReceiptBill();
// String substring = materialCode.substring(0, 2);
// switch (substring){
// case "dz":
// receiptBill.setMaterialCode("dz");
// receiptBill.setMaterialName("端子盘");
// break;
// case "mj":
// receiptBill.setMaterialCode("mj");
// receiptBill.setMaterialName("模具");
// break;
// case "dx":
// receiptBill.setMaterialCode("dx");
// receiptBill.setMaterialName("导线");
// break;
// }
//
//
// receiptBill.setCompanyCode("BHF");
// receiptBill.setReceiptContainerCode(containerCode);
// receiptBill.setQty(new BigDecimal(1));
// receiptBills.add(receiptBill);
//
// ReceiptContainerView record = new ReceiptContainerView();
// record.setReceiptContainerCode(containerCode);
// record.setLocationCode(locationCode);
// record.setTaskType((short)100);
// record.setCompanyCode("BHF");
// receiptContainerHeaderService.checkContainer(record);
// if(locationCode != null) {
// receiptContainerHeaderService.mobileCheckLocationCode(record);
// }
// int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
// ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
// List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
// if(receiptDetailIds != null && receiptDetailIds.size() > 0) {
// int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
// if(containerHeaderId > 0) {
// List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
// if(receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
// List<Integer> idList = Arrays.asList(containerHeaderId);
// List<Integer> idsList = idList.stream().distinct().collect(Collectors.toList());
// AjaxResult receiptTask = receiptTaskService.createReceiptTask(idsList);
// if (receiptTask.hasErr()){
// return AjaxResult.error("生成任务失败");
// }
// AgvTask agvTask=new AgvTask();
// agvTask.setWarehouseCode("CS0001");
// agvTask.setFromPort(port);
// agvTask.setToPort("1001");
// agvTask.setContainerCode(containerCode);
// agvTask.setTaskType(QuantityConstant.TASK_TYPE_WHOLESHIPMENT);
//// agvTask.setPreTaskNo(one.getId());
// agvTask.setCreatedBy("Mes");
// AjaxResult ajaxResult = acsService.executeAGVTask(agvTask);
// if (ajaxResult.hasErr()){
// return AjaxResult.error("下发AGV任务失败");
// }
// return AjaxResult.success();
// } else {
// return AjaxResult.error("入库组盘失败");
// }
// } else {
// return AjaxResult.error("插入入库容器表单头失败");
// }
// } else {
// return AjaxResult.error("插入入库明细表单失败");
// }
//
// }
//
// @PostMapping("/MesCallOut")
// @ApiOperation("Mes出库")
// @ApiLogger(apiName = "Mes出库", from="ROBOT")
// @Transactional(rollbackFor = Exception.class)
// @ResponseBody
// public AjaxResult MesCallOut(@RequestBody MesCallIn mesCallIn) {
// String materialCode=mesCallIn.getMaterialCode();
// String port = mesCallIn.getPort();
// if (StringUtils.isEmpty(materialCode)){
// return AjaxResult.error("物料信息不能为空");
// }
// if (StringUtils.isEmpty(port)){
// return AjaxResult.error("站台不能为空");
// }
// switch (materialCode){
// case "1" :
// materialCode="dx";
// break;
// case "2" :
// materialCode="dz";
// break;
// case "3" :
// materialCode="mj";
// break;
// case "4" :
// materialCode="kongpan";
// break;
// }
// LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper=Wrappers.lambdaQuery();
// inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getMaterialCode,materialCode)
// .last("ORDER BY id asc limit 1");
// InventoryDetail one = inventoryDetailService.getOne(inventoryDetailLambdaQueryWrapper);
// if (one==null){
// return AjaxResult.error("库内没有该物料信息");
// }
// LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper =Wrappers.lambdaQuery();
// inventoryHeaderLambdaQueryWrapper.eq(InventoryHeader::getId,one.getInventoryHeaderId());
// InventoryHeader one1 = inventoryHeaderService.getOne(inventoryHeaderLambdaQueryWrapper);
// if (one1==null){
// return AjaxResult.error("库内没有该物料信息");
// }
// String inventoryHeaderId = one1.getId().toString();
// inventoryHeaderForShipmentService.shipmentContainer(inventoryHeaderId, port);
//
// return AjaxResult.success();
//>>>>>>> d3df4772feeca5d7bb71da9dfbf2dfb9cde02b24
// }
//}