|
1
2
|
package com.huaheng.api.mes.controller;
|
|
3
4
|
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
|
|
5
6
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
7
8
9
|
import com.huaheng.api.mes.dto.*;
import com.huaheng.api.mes.dto.otherReceipt.OtherReceiptDetail;
import com.huaheng.api.mes.dto.otherReceipt.OtherReceiptHeader;
|
|
10
|
import com.huaheng.api.mes.result.ReturnInfo;
|
|
11
|
import com.huaheng.api.mes.service.IMesService;
|
|
12
13
|
import com.huaheng.api.mes.utils.CallaMOM;
import com.huaheng.api.mes.utils.SqlServer;
|
|
14
|
import com.huaheng.api.mes.vo.InventoryVO;
|
|
15
|
import com.huaheng.api.mes.vo.InventoryTransactionVO;
|
|
16
|
import com.huaheng.common.constant.QuantityConstant;
|
|
17
|
import com.huaheng.common.exception.service.ServiceException;
|
|
18
|
import com.huaheng.common.utils.StringUtils;
|
|
19
|
import com.huaheng.common.utils.reflect.ReflectUtils;
|
|
20
|
import com.huaheng.common.utils.security.ShiroUtils;
|
|
21
22
23
24
|
import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.framework.web.domain.RetCode;
|
|
25
|
import com.huaheng.pc.config.address.service.AddressService;
|
|
26
|
import com.huaheng.pc.config.material.domain.Material;
|
|
27
|
import com.huaheng.pc.config.material.service.MaterialService;
|
|
28
29
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
|
|
30
31
|
import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
|
|
32
|
import com.huaheng.pc.momLog.service.IMomLogService;
|
|
33
34
35
36
37
38
39
40
|
import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
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.shipment.shipmentDetail.domain.ShipmentDetail;
import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
|
|
41
42
|
import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
|
|
43
44
|
import com.huaheng.pc.system.user.domain.User;
import com.huaheng.pc.system.user.service.IUserService;
|
|
45
46
|
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
|
|
47
|
import io.swagger.annotations.ApiOperation;
|
|
48
|
import lombok.extern.slf4j.Slf4j;
|
|
49
50
|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
|
|
51
|
import org.springframework.beans.BeanUtils;
|
|
52
53
54
|
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
|
|
55
|
import java.io.UnsupportedEncodingException;
|
|
56
57
58
59
|
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
|
|
60
|
import java.util.*;
|
|
61
|
|
|
62
|
|
|
63
|
@RestController
|
|
64
|
@Slf4j
|
|
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
@RequestMapping("/API/WMS/v2")
public class MesReceiptController extends BaseController {
@Resource
private ReceiptHeaderService receiptHeaderService;
@Resource
private ReceiptDetailService receiptDetailService;
@Resource
private ShipmentHeaderService shipmentHeaderService;
@Resource
private ShipmentDetailService shipmentDetailService;
@Resource
private InventoryDetailService inventoryDetailService;
|
|
83
84
85
|
@Resource
private TaskDetailService taskDetailService;
|
|
86
87
88
89
|
@Resource
private InventoryTransactionService inventoryTransactionService;
@Resource
|
|
90
91
|
private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
@Resource
|
|
92
93
|
private MaterialService materialService;
|
|
94
95
|
@Resource
private IMomLogService momLogService;
|
|
96
97
|
@Resource
private IMesService mesService;
|
|
98
99
|
@Resource
private IUserService userService;
|
|
100
|
|
|
101
102
103
|
@Resource
private AddressService addressService;
|
|
104
|
@PostMapping("/receipt")
|
|
105
|
@ApiLogger(apiName = "添加入库单及其明细", from = "ROBOT")
|
|
106
107
|
@ApiOperation("添加入库单及其明细")
public AjaxResult receipt(@RequestBody ReceiptDTO receiptDTO) {
|
|
108
109
110
|
AjaxResult ajaxResult = handleQuest("receipt", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
|
|
111
|
return mesService.receipt(receiptDTO);
|
|
112
|
}
|
|
113
114
|
});
return ajaxResult;
|
|
115
116
|
}
|
|
117
|
|
|
118
119
|
/**
* 添加出库单及其明细
|
|
120
|
*
|
|
121
122
123
124
|
* @param receiptDTO
* @return
*/
@PostMapping("/shipment")
|
|
125
|
@ApiLogger(apiName = "添加出库单及其明细", from = "ROBOT")
|
|
126
127
|
@ApiOperation("添加出库单及其明细")
public AjaxResult shipment(@RequestBody ReceiptDTO receiptDTO) {
|
|
128
129
130
|
AjaxResult ajaxResult = handleQuest("shipment", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
|
|
131
|
return mesService.shipment(receiptDTO);
|
|
132
|
}
|
|
133
|
});
|
|
134
|
return ajaxResult;
|
|
135
136
|
}
|
|
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
private JSONObject getJsonObject(Header header, List<Detail> details) {
JSONObject data = new JSONObject();
JSONObject Rd_In_M = new JSONObject();
Rd_In_M.put("MGPK", header.getId());
Rd_In_M.put("cCode", header.getReferCode());
JSONArray Rd_In_S = new JSONArray();
details.forEach(detail -> {
JSONObject json = new JSONObject();
json.put("MGPK", header.getId());
json.put("SGPK", detail.getId());
json.put("cInvCode", detail.getMaterialCode());
Rd_In_S.add(json);
});
data.put("Requester", "WMS");
data.put("Rd_In_M", Rd_In_M);
data.put("Rd_In_S", Rd_In_S);
return data;
}
|
|
156
|
|
|
157
158
|
/**
* 入库单参数_判空处理
|
|
159
|
*
|
|
160
161
162
163
|
* @param ajaxResult
* @param shipmentHeader
* @param shipemtnDetails
*/
|
|
164
|
private boolean enterIsNull(AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails) {
|
|
165
|
|
|
166
|
if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)) {
|
|
167
168
|
return true;
}
|
|
169
170
171
172
173
174
175
|
if (StringUtils.isEmpty(shipmentHeader.getRefeCodeType())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("单据类型不能为空!!!");
return true;
} else if (StringUtils.isEmpty(shipmentHeader.getReferCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("单据单号不能为空!!!");
return true;
|
|
176
|
} else if (shipmentHeader.getTotalQty() == null || shipmentHeader.getTotalQty().intValue() <= 0) {
|
|
177
|
ajaxResult.setCode(RetCode.FAIL).setMsg("数量不能为空!!!");
|
|
178
179
|
}
|
|
180
|
shipemtnDetails.forEach(shipemtnDetail -> {
|
|
181
182
|
if (StringUtils.isEmpty(shipemtnDetail.getMaterialCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("物料编码不能为空!!!");
|
|
183
184
|
} else if (shipemtnDetail.getTotalQty() == null || shipemtnDetail.getQty().intValue() <= 0) {
ajaxResult.setCode(RetCode.FAIL).setMsg("数量不能为空!!!");
|
|
185
186
187
188
189
190
191
|
}
});
return StringUtils.isNotEmpty(ajaxResult.getMsg());
}
/**
* 出库单参数_判空处理
|
|
192
|
*
|
|
193
194
195
196
|
* @param ajaxResult
* @param shipmentHeader
* @param shipemtnDetails
*/
|
|
197
198
|
private boolean outIsNull(AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails) {
if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)) {
|
|
199
200
|
return true;
}
|
|
201
202
203
204
205
206
|
if (StringUtils.isEmpty(shipmentHeader.getReferCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("单据单号不能为空!!!");
return true;
}
|
|
207
|
shipemtnDetails.forEach(shipemtnDetail -> {
|
|
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
if (StringUtils.isEmpty(shipemtnDetail.getMaterialCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("物料编码不能为空!!!");
}
});
return StringUtils.isNotEmpty(ajaxResult.getMsg());
}
/**
* 判空处理
*/
private boolean isNullData(AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails) {
if (shipmentHeader == null) {
ajaxResult.setCode(RetCode.FAIL).setMsg("出库单头表不能为空!!!");
return true;
} else if (shipemtnDetails == null || shipemtnDetails.size() < 1) {
ajaxResult.setCode(RetCode.FAIL).setMsg("出库单明细表集不能为空!!!");
return true;
}
return false;
}
/**
|
|
230
|
* 入库单单据取消
|
|
231
|
*/
|
|
232
233
|
@PostMapping("/cancelEnterWarehouse")
@ApiOperation("入库单单据取消")
|
|
234
|
@ApiLogger(apiName = "入库单单据取消", from = "ROBOT")
|
|
235
|
public AjaxResult cancelEnterWarehouse(@RequestBody ReceiptDTO receiptDTO) {
|
|
236
237
238
239
240
|
AjaxResult ajaxResult = handleQuest("cancelEnterWarehouse", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.cancelEnterWarehouse(receiptDTO);
return ajaxResult;
|
|
241
|
}
|
|
242
243
|
});
return ajaxResult;
|
|
244
245
246
247
248
249
250
251
|
}
/**
* 出库单单据取消
*/
@PostMapping("/cancelOutWarehouse")
@ApiOperation("出库单单据取消")
|
|
252
|
@ApiLogger(apiName = "出库单单据取消", from = "ROBOT")
|
|
253
|
public AjaxResult cancelOutWarehouse(@RequestBody ReceiptDTO receiptDTO) {
|
|
254
255
256
257
258
|
AjaxResult ajaxResult = handleQuest("cancelOutWarehouse", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.cancelOutWarehouse(receiptDTO);
return ajaxResult;
|
|
259
|
}
|
|
260
261
|
});
return ajaxResult;
|
|
262
263
264
265
266
267
268
269
270
271
|
}
private AjaxResult isNull(Header header, List<Detail> details) {
AjaxResult ajaxResult = new AjaxResult();
boolean isNull = outIsNull(ajaxResult, header, details);
details.forEach(detail -> {
if (detail.getTotalQty() == null || detail.getTotalQty().intValue() <= 0) {
ajaxResult.setCode(RetCode.FAIL).setMsg("总数量不能为空!!!");
}
});
|
|
272
|
if (isNull || StringUtils.isNotEmpty(ajaxResult.getMsg())) {
|
|
273
274
|
return ajaxResult;
}
|
|
275
|
return ajaxResult;
|
|
276
277
278
279
280
281
|
}
/**
* 查询库存
*/
@PostMapping("/searchInventory")
|
|
282
|
@ApiLogger(apiName = "查询库存", from = "ROBOT")
|
|
283
284
285
|
@ApiOperation("查询库存")
public AjaxResult searchInventory(@RequestBody Detail detailed) {
|
|
286
|
String materialName = detailed.getMaterialName();
|
|
287
|
String materialCode = detailed.getMaterialCode();
|
|
288
|
String containerCode = detailed.getContainerCode();
|
|
289
|
|
|
290
291
|
LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
// 物料编码
|
|
292
|
if (StringUtils.isNotEmpty(materialName)) {
|
|
293
294
|
lambdaQueryWrapper.eq(InventoryDetail::getMaterialName, materialName);
}
|
|
295
|
// 物料名称
|
|
296
|
if (StringUtils.isNotEmpty(materialCode)) {
|
|
297
298
|
lambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, materialCode);
}
|
|
299
|
// 托盘号
|
|
300
|
if (StringUtils.isNotEmpty(containerCode)) {
|
|
301
302
|
lambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
}
|
|
303
|
|
|
304
|
if (StringUtils.isEmpty(materialName) && StringUtils.isEmpty(containerCode) && StringUtils.isEmpty(containerCode)) {
|
|
305
306
|
lambdaQueryWrapper.gt(InventoryDetail::getQty, 0);
}
|
|
307
|
List<InventoryDetail> detailList = inventoryDetailService.list(lambdaQueryWrapper);
|
|
308
|
|
|
309
|
List<InventoryVO> inventoryVOList = new ArrayList<>();
|
|
310
|
detailList.forEach(detail -> {
|
|
311
|
InventoryVO inventoryVO = new InventoryVO();
|
|
312
|
BeanUtils.copyProperties(detail, inventoryVO);
|
|
313
|
inventoryVO.setWarehouse("035");
|
|
314
|
inventoryVOList.add(inventoryVO);
|
|
315
316
|
});
|
|
317
|
return AjaxResult.success(inventoryVOList);
|
|
318
319
320
321
|
}
/**
|
|
322
|
* 获取出入库单明细记录
|
|
323
|
*
|
|
324
325
326
|
* @return AjaxResult
*/
@PostMapping("/getShipmentDetail")
|
|
327
|
@ApiLogger(apiName = "获取出入库单明细记录", from = "ROBOT")
|
|
328
|
@ApiOperation("获取出入库单明细记录")
|
|
329
330
|
public AjaxResult getShipmentDetail(@RequestBody GetOrderHistoryDTO getOrderHistoryDTO) {
|
|
331
|
if (StringUtils.isEmpty(getOrderHistoryDTO.getEndTime()) || StringUtils.isEmpty(getOrderHistoryDTO.getStartTime())) {
|
|
332
333
|
return AjaxResult.error("开始时间和结束时间不能为空!!!");
}
|
|
334
|
LambdaQueryWrapper<InventoryTransaction> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
335
|
lambdaQueryWrapper
|
|
336
337
338
339
340
341
342
343
344
345
|
.ge(InventoryTransaction::getCreated, getOrderHistoryDTO.getStartTime())
.le(InventoryTransaction::getCreated, getOrderHistoryDTO.getEndTime());
List<InventoryTransaction> list = inventoryTransactionService.list(lambdaQueryWrapper);
List<InventoryTransactionVO> inventoryTransactionVOList = new ArrayList<>();
list.forEach(inventoryTransaction -> {
InventoryTransactionVO inventoryTransactionVO = new InventoryTransactionVO();
BeanUtils.copyProperties(inventoryTransaction, inventoryTransactionVO);
inventoryTransactionVOList.add(inventoryTransactionVO);
});
return AjaxResult.success(inventoryTransactionVOList);
|
|
346
347
348
349
350
351
352
|
}
/**
* 获取sqlServer数据库中物料信息, 同步到本地数据库中
*/
@PostMapping("/getMaterial")
@ApiOperation("获取外部物料信息")
|
|
353
|
public List<Material> getMaterial() {
|
|
354
|
List<Material> materialList = new ArrayList<>();
|
|
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
|
// 获取新增一天以内和修改四个小时以内的物料数据
//String sql = "select a.cInvCode, a.cInvName, b.cidefine6, b.cidefine7, c.cComUnitName from [dbo].[Inventory] a left join [dbo].[Inventory_extradefine] b on a.cInvCode = b.cInvCode LEFT JOIN [dbo].[ComputationUnit] c ON a.cComUnitCode = c.cComunitCode WHERE (datediff(day,a.dSDate,getdate())=0 OR a.dModifyDate >= DATEADD(HOUR, -4, GETDATE())) and a.cDefWareHouse in ('035','003')";
//DATEDIFF() 函数返回两个日期之间的天数。
final String SQL_QUERY = "SELECT " +
"a.cinvcode, " +
"a.cinvname, " +
"a.cDefWareHouse, " +
"a.cComUnitCode, " +
"b.cComUnitName, " +
"c.cidefine6, " +
"c.cidefine7, " +
"a.dModifyDate, " +
"a.dSDate, " +
"a.cinvstd, " +
"a.Iinvweight, " +
"a.cinvccode, " +
"d.cInvCName " +
"FROM " +
"[dbo].[Inventory] a " +
"LEFT JOIN [dbo].[ComputationUnit] b ON a.cComUnitCode= b.cComUnitCode " +
"LEFT JOIN [dbo].[Inventory_extradefine] c ON a.cinvcode= c.cinvcode " +
"LEFT JOIN [dbo].[InventoryClass] d on a.cinvccode= d.cinvccode " +
"WHERE ( datediff( DAY, a.dSDate, getdate( ) ) = 0 OR a.dModifyDate >= DATEADD( HOUR, - 4, GETDATE( ) ) ) " +
"AND a.cDefWareHouse IN ( '035', '003' ,'001')";
|
|
382
|
try {
|
|
383
384
|
ResultSet resultSet = SqlServer.find(SQL_QUERY);
|
|
385
|
if (resultSet == null) {
|
|
386
387
|
return materialList;
}
|
|
388
|
while (resultSet.next()) {
|
|
389
|
// 字段要一致
|
|
390
391
392
|
Material material = new Material();
material.setWarehouseCode("CS0001");
material.setCompanyCode("BHF");
|
|
393
|
|
|
394
395
396
397
398
399
400
401
402
403
404
405
|
material.setCode(resultSet.getString("cInvCode")); // 物料编码
material.setName(resultSet.getString("cInvName")); // 物料名称
material.setUnit(resultSet.getString("cComUnitName")); // 单位名称
material.setSpec(resultSet.getString("cinvstd")); // 规格
material.setIsHigh("高托".equals(resultSet.getString("cidefine7")) ? 1 : 0); // 托盘类型
material.setPhysicalDimension(resultSet.getString("cidefine6")); // 外形尺寸
material.setDefWareHouse(resultSet.getString("cDefWareHouse")); // u8仓库
material.setUnitCode(resultSet.getString("cComUnitCode")); // 单位编码
material.setWeight(resultSet.getString("Iinvweight")); // 重量
material.setCinvccode(resultSet.getString("cinvccode")); // 存货类别编码
material.setCInvCName(resultSet.getString("cInvCName")); // 存货类别名称
|
|
406
407
|
materialList.add(material);
}
|
|
408
409
|
} catch (SQLException e) {
log.error("同步海王物料失败!!!" + e.getMessage());
|
|
410
411
|
}
return materialList;
|
|
412
|
}
|
|
413
|
|
|
414
415
416
|
/**
* 当前时间向推几小时
*/
|
|
417
418
419
420
421
422
423
424
425
426
427
428
429
|
public String dateRoll(int ihour) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 获取当前时间
LocalDateTime date = LocalDateTime.now();
// 获取当前时间的前几小时时间
LocalDateTime localDateTime = date.minusHours(ihour);
return dateTimeFormatter.format(localDateTime);
}
/**
* 查询站台任务明细列表
*/
|
|
430
|
@ApiLogger(apiName = "查询站台任务明细列表", from = "ROBOT")
|
|
431
|
@PostMapping("/kanbanInfo")
|
|
432
|
@CrossOrigin
|
|
433
|
public AjaxResult kanbanInfo(@RequestBody TaskDetail taskDetail) {
|
|
434
|
String fromLocation = taskDetail.getFromLocation();
|
|
435
|
if (StringUtils.isEmpty(fromLocation)) {
|
|
436
|
return AjaxResult.error("站台不能为空!!!");
|
|
437
|
}
|
|
438
439
|
LambdaQueryWrapper<TaskDetail> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TaskDetail::getFromLocation, fromLocation)
|
|
440
|
.lt(TaskDetail::getStatus, "100");
|
|
441
442
443
444
|
List<TaskDetail> taskDetailList = taskDetailService.list(wrapper);
return AjaxResult.success(taskDetailList);
}
|
|
445
|
/**
|
|
446
|
* post调用E_Rd_In(MOM)入库成功接口
|
|
447
|
*/
|
|
448
|
//@ApiLogger(apiName = "post调用E_Rd_In(MOM)入库接口", from="ROBOT")
|
|
449
|
@PostMapping("/postE_Rd_In")
|
|
450
|
public ReturnInfo postE_Rd_In(@RequestBody ReceiptDetail receiptDetail) {
|
|
451
452
453
454
455
|
if (StringUtils.isNotBlank(receiptDetail.getLastUpdatedBy())) {
receiptDetail.setLastUpdatedBy("PDA");
} else if (StringUtils.isNotEmpty(ShiroUtils.getName())) {
receiptDetail.setLastUpdatedBy(ShiroUtils.getName());
}
|
|
456
|
User user = userService.selectUserByEmail(receiptDetail.getLastUpdatedBy());
|
|
457
458
459
460
461
462
463
|
String loginName = "";
if (user == null) {
loginName = "PDA";
} else {
loginName = user.getLoginName();
}
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
|
|
464
|
JSONObject Rd_In_M = new JSONObject();
|
|
465
466
|
Rd_In_M.put("mno", receiptHeader.getCode());
Rd_In_M.put("MGPK", receiptHeader.getMOMID());
|
|
467
468
469
|
Rd_In_M.put("cBusType", receiptHeader.getReceiptType());
Rd_In_M.put("TAID", receiptHeader.getTAID());
Rd_In_M.put("FAID", receiptHeader.getFAID());
|
|
470
|
Rd_In_M.put("UserNo", loginName);
|
|
471
|
Rd_In_M.put("warehouse", receiptHeader.getWarehouse());
|
|
472
|
|
|
473
|
JSONArray jsonArray = new JSONArray();
|
|
474
475
476
477
478
|
JSONObject Rd_In_S = new JSONObject();
Rd_In_S.put("MGPK", receiptHeader.getMOMID());
Rd_In_S.put("SGPK", receiptDetail.getMOMID());
Rd_In_S.put("SNNO", receiptDetail.getSNNO());
Rd_In_S.put("cInvCode", receiptDetail.getMaterialCode());
|
|
479
480
|
Rd_In_S.put("Iquantity", receiptDetail.getTaskQty());
Rd_In_S.put("iFQuantity", receiptDetail.getQty());
|
|
481
|
Rd_In_S.put("cwhcode", "035");
|
|
482
483
484
485
486
|
Rd_In_S.put("MOCode", receiptDetail.getNoticeNo());
Rd_In_S.put("ISUrgent", receiptDetail.getIsUrgent());
Rd_In_S.put("receiptBarcode", receiptDetail.getReceiptBarcode());
Rd_In_S.put("warehouse", receiptHeader.getWarehouse());
Rd_In_S.put("warehouseName", receiptHeader.getWarehouseName());
|
|
487
|
Rd_In_S.put("creatorCode", loginName);
|
|
488
|
Rd_In_S.put("creatorName", receiptDetail.getLastUpdatedBy());
|
|
489
490
|
Rd_In_S.put("productionWorker", receiptHeader.getProductionWorker());
Rd_In_S.put("productionWorkerName", receiptHeader.getProductionWorkerName());
|
|
491
492
493
|
Rd_In_S.put("ifrom", receiptDetail.getIfrom());
Rd_In_S.put("LMPKID", receiptDetail.getLMPKID());
Rd_In_S.put("LSPKID", receiptDetail.getLSPKID());
|
|
494
495
496
497
498
499
500
501
|
jsonArray.add(Rd_In_S);
JSONObject data = new JSONObject();
data.put("Rd_In_M", Rd_In_M);
data.put("Rd_In_S", jsonArray);
String action = "E_Rd_In";
JSONObject json = new JSONObject();
json.put("data", data);
|
|
502
|
return postMOM(action, json, "入库回传");
|
|
503
504
505
506
507
508
|
}
/**
* post调用E_Rd_In(MOM)其他入库成功接口
*/
|
|
509
|
//@ApiLogger(apiName = "post调用E_Rd_In(MOM)其他入库接口", from="ROBOT")
|
|
510
|
@PostMapping("/postOther_E_Rd_In")
|
|
511
|
public ReturnInfo postOther_E_Rd_In(@RequestBody List<ReceiptDetail> receiptDetails, ReceiptHeader receiptHeader) {
|
|
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
|
OtherReceiptDomain domain = new OtherReceiptDomain();
OtherReceiptHeader receiptHeader1 = new OtherReceiptHeader();
receiptHeader1.setCode(receiptHeader.getCode());
receiptHeader1.setMomId(receiptHeader.getMOMID());
receiptHeader1.setReceiptType(receiptHeader.getReceiptType());
receiptHeader1.setTaId(receiptHeader.getTAID());
receiptHeader1.setFaId(receiptHeader.getFAID());
receiptHeader1.setLastUpdatedBy(receiptHeader.getLastUpdatedBy());
receiptHeader1.setWarehouse(receiptHeader.getWarehouse());
receiptHeader1.setDepCode(QuantityConstant.DEFAULT_DEPT);
receiptHeader1.setStock(QuantityConstant.DEFAULT_STOCK);
List<OtherReceiptDetail> list = new ArrayList<>();
for (ReceiptDetail receiptDetail : receiptDetails) {
OtherReceiptDetail detail = new OtherReceiptDetail();
detail.setMomIdByHeader(receiptHeader.getMOMID());
detail.setMomId(receiptDetail.getMOMID());
detail.setSnNo(receiptDetail.getSNNO());
detail.setMaterialCode(receiptDetail.getMaterialCode());
detail.setTaskQty(receiptDetail.getTaskQty());
detail.setQty(receiptDetail.getQty());
detail.setWarehouseCode(receiptDetail.getWarehouseCode());
detail.setNotice(receiptDetail.getNoticeNo());
detail.setISUrgent(receiptDetail.getIsUrgent());
detail.setReceiptBarcode(receiptDetail.getReceiptBarcode());
detail.setWarehouse(receiptHeader.getWarehouse());
detail.setWarehouseName(receiptHeader.getWarehouseName());
detail.setLastUpdatedBy(receiptDetail.getLastUpdatedBy());
detail.setLastUpdatedByName(receiptDetail.getLastUpdatedByName());
detail.setProductionWorker(receiptHeader.getProductionWorker());
detail.setProductionWorkerName(receiptHeader.getProductionWorkerName());
list.add(detail);
}
domain.setReceiptHeader(receiptHeader1);
domain.setReceiptDetails(list);
//返回实体
ReturnDomain data = new ReturnDomain();
data.setData(domain);
String str = JSONObject.toJSONString(data);
JSONObject jsonObject = JSONObject.parseObject(str);
|
|
554
|
return postMOM("E_Rd_In", jsonObject, "其他入库回传");
|
|
555
556
557
|
}
/**
|
|
558
|
* post调用E_Rd_In(MOM)出库成功接口
|
|
559
|
*/
|
|
560
|
//@ApiLogger(apiName = "post调用E_Rd_Out(MOM)出库接口", from="ROBOT")
|
|
561
|
@PostMapping("/postE_Rd_Out")
|
|
562
|
public Boolean postE_Rd_Out(@RequestBody ShipmentHeader shipmentHeader) {
|
|
563
|
// ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentHeaderID.getId());
|
|
564
|
//StringBuffer keyField = new StringBuffer();
|
|
565
566
|
JSONArray dataArray = new JSONArray();
// 如果订单为合并类型
|
|
567
|
if ("merge".equals(shipmentHeader.getShipmentType())) {
|
|
568
|
// 查询所有子表
|
|
569
|
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
|
|
570
|
// 查询所有合并前的头表
|
|
571
572
573
574
575
576
577
|
StringBuilder ids = new StringBuilder();
for (ShipmentDetail shipmentDetail : shipmentDetailList) {
ids.append(",").append(shipmentDetail.getRecordCode());
}
String codes = ids.substring(1, ids.length());
String[] headerIdArr = codes.split(",");
|
|
578
|
List<ShipmentHeader> shipmentHeaderList = new ArrayList<>();
|
|
579
580
581
582
583
584
585
|
List<ShipmentHeaderHistory> list2 = shipmentHeaderHistoryService.list(new LambdaQueryWrapper<ShipmentHeaderHistory>().in(ShipmentHeaderHistory::getCode, headerIdArr));
for (ShipmentHeaderHistory shipmentHeaderHistory : list2) {
ShipmentHeader shipmentHeader1 = new ShipmentHeader();
BeanUtils.copyProperties(shipmentHeaderHistory, shipmentHeader1);
shipmentHeaderList.add(shipmentHeader1);
}
|
|
586
|
// 根据合并前的头表id分组
|
|
587
|
Map<String, List<ShipmentDetail>> map = new HashMap<>();
|
|
588
|
for (ShipmentDetail detail : shipmentDetailList) {
|
|
589
|
String key = detail.getRecordCode();
|
|
590
591
592
593
594
595
596
|
if (key != null) {
if (map.containsKey(key)) {
map.get(key).add(detail);
} else {
List<ShipmentDetail> list = new ArrayList<>();
list.add(detail);
map.put(key, list);
|
|
597
|
}
|
|
598
|
}
|
|
599
|
}
|
|
600
|
|
|
601
|
for (String key : map.keySet()) {
|
|
602
603
604
605
606
|
JSONObject data = new JSONObject();
// 合并前的头表
ShipmentHeader header = new ShipmentHeader();
// 合并前头表对应的子表
List<ShipmentDetail> detailList = new ArrayList<>();
|
|
607
|
for (ShipmentHeader SH : shipmentHeaderList) {
|
|
608
|
if (key.equals(SH.getCode())) {
|
|
609
610
|
header = SH;
detailList = map.get(key);
|
|
611
|
break;
|
|
612
613
614
|
}
}
// 查询出库单据表头
|
|
615
|
JSONObject Rd_Out_M = getRd_Out_M(header, shipmentHeader.getCreatedBy());
|
|
616
617
618
619
620
|
JSONArray jsonArray = getRd_Out_S(header, detailList);
data.put("Rd_Out_M", Rd_Out_M);
data.put("Rd_Out_S", jsonArray);
dataArray.add(data);
}
|
|
621
|
} else {
|
|
622
|
// 查询出库单据表头
|
|
623
|
JSONObject Rd_Out_M = getRd_Out_M(shipmentHeader, "");
|
|
624
|
// 查询出库单据明细
|
|
625
626
|
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>()
.eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
|
|
627
|
JSONArray jsonArray = getRd_Out_S(shipmentHeader, shipmentDetailList);
|
|
628
629
630
631
632
633
634
635
636
|
JSONObject data = new JSONObject();
data.put("Rd_Out_M", Rd_Out_M);
data.put("Rd_Out_S", jsonArray);
dataArray.add(data);
}
String action = "E_Rd_Out";
JSONObject json = new JSONObject();
json.put("data", dataArray);
|
|
637
638
|
ReturnInfo returnInfo = postMOM(action, json, "出库回传");
if (returnInfo == null) {
|
|
639
640
641
|
shipmentHeader.setErrorMsg("出库回传:接口地址错误或返回为空");
shipmentHeader.setPushSuccessStatus(2);
shipmentHeaderService.updateById(shipmentHeader);
|
|
642
|
return false;
|
|
643
|
}
|
|
644
|
shipmentHeader.setPushErrorCount(shipmentHeader.getPushErrorCount() + 1);
|
|
645
|
if (returnInfo.hasError()) {
|
|
646
|
shipmentHeader.setPushSuccessStatus(1);
|
|
647
648
|
shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
|
|
649
|
} else {
|
|
650
|
shipmentHeader.setPushSuccessStatus(2);
|
|
651
|
shipmentHeader.setErrorMsg(returnInfo.getMsg());
|
|
652
|
}
|
|
653
654
|
shipmentHeaderService.updateById(shipmentHeader);
return true;
|
|
655
656
657
|
}
|
|
658
|
public JSONArray getRd_Out_S(ShipmentHeader shipmentHeader, List<ShipmentDetail> shipmentDetailList) {
|
|
659
|
JSONArray jsonArray = new JSONArray();
|
|
660
|
shipmentDetailList.forEach(shipmentDetail -> {
|
|
661
|
User user = userService.selectUserByEmail(shipmentDetail.getLastUpdatedBy());
|
|
662
663
664
|
if (user == null) {
user = userService.selectUserByEmail(shipmentHeader.getLastUpdatedBy());
}
|
|
665
|
JSONObject Rd_Out_S = new JSONObject();
|
|
666
|
Rd_Out_S.put("MGPK", shipmentHeader.getMOMID());
|
|
667
668
669
|
Rd_Out_S.put("SGPK", shipmentDetail.getMOMID());
Rd_Out_S.put("SNNO", shipmentDetail.getSNNO());
Rd_Out_S.put("cInvCode", shipmentDetail.getMaterialCode());
|
|
670
|
// 实际入库数量
|
|
671
|
Rd_Out_S.put("Iquantity", shipmentDetail.getTaskQty());
|
|
672
|
// MOM传入的入库数量
|
|
673
|
Rd_Out_S.put("iFQuantity", shipmentDetail.getQty());
|
|
674
|
Rd_Out_S.put("cwhcode", "035");
|
|
675
676
|
Rd_Out_S.put("MOCode", shipmentDetail.getNoticeNo());
Rd_Out_S.put("ISUrgent", shipmentDetail.getIsUrgent());
|
|
677
|
Rd_Out_S.put("updatedByNo", user.getLoginName());
|
|
678
679
680
|
Rd_Out_S.put("updatedBy", shipmentDetail.getLastUpdatedBy());
Rd_Out_S.put("warehouse", shipmentHeader.getWarehouse());
Rd_Out_S.put("warehouseName", shipmentHeader.getWarehouseName());
|
|
681
682
683
684
685
686
|
Rd_Out_S.put("creatorCode", shipmentHeader.getCreatorCode());
Rd_Out_S.put("creatorName", shipmentHeader.getCreatorName());
// Rd_Out_S.put("requestedStartDate", shipmentHeader.getRequestedStartDate());
Rd_Out_S.put("ifrom", shipmentDetail.getIfrom());
Rd_Out_S.put("LMPKID", shipmentDetail.getLMPKID());
Rd_Out_S.put("LSPKID", shipmentDetail.getLSPKID());
|
|
687
688
|
jsonArray.add(Rd_Out_S);
});
|
|
689
690
|
return jsonArray;
}
|
|
691
|
|
|
692
|
public JSONObject getRd_Out_M(@RequestBody ShipmentHeader shipmentHeader, String name) {
|
|
693
|
User user = userService.selectUserByEmail(shipmentHeader.getLastUpdatedBy());
|
|
694
|
JSONObject Rd_Out_M = new JSONObject();
|
|
695
|
Rd_Out_M.put("ISMOM", shipmentHeader.getISMOM());
|
|
696
697
698
699
700
|
Rd_Out_M.put("mno", shipmentHeader.getCode());
Rd_Out_M.put("MGPK", shipmentHeader.getMOMID());
Rd_Out_M.put("cBusType", shipmentHeader.getShipmentType());
Rd_Out_M.put("TAID", shipmentHeader.getTAID());
Rd_Out_M.put("FAID", shipmentHeader.getFAID());
|
|
701
702
703
704
705
706
|
if (user == null) {
String UserNo = userService.selectUserByEmail(name).getLoginName();
Rd_Out_M.put("UserNo", UserNo);
} else {
Rd_Out_M.put("UserNo", user.getLoginName());
}
|
|
707
|
Rd_Out_M.put("warehouse", "035");
|
|
708
709
|
Rd_Out_M.put("cDepCode", "01030101");//部门编码
Rd_Out_M.put("cWhCode", shipmentHeader.getWarehouse());//仓库编码
|
|
710
|
return Rd_Out_M;
|
|
711
712
|
}
|
|
713
714
715
716
717
|
/**
* utf-8 转 GB2312
*/
public String getGB(String action) {
byte[] Rd_Out; //中间用ISO-8859-1过渡
|
|
718
719
720
721
722
723
724
725
726
727
728
|
String data = null;
try {
Rd_Out = action.getBytes("8859_1");
data = new String(Rd_Out, "GB2312"); //转换成GB2312字符
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return data;
}
|
|
729
|
/**
|
|
730
|
* @param action MOM行为
|
|
731
732
733
|
* @param JObject 行为参数
* @return
*/
|
|
734
|
public ReturnInfo postMOM(String action, JSONObject JObject, String apiName) {
|
|
735
|
String url = addressService.selectAddress(QuantityConstant.MOM);
|
|
736
|
return CallaMOM.getMsg(action, JObject, apiName, url);
|
|
737
|
}
|
|
738
|
|
|
739
|
|
|
740
|
}
|