|
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
21
22
23
|
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;
|
|
24
|
import com.huaheng.pc.config.address.service.AddressService;
|
|
25
|
import com.huaheng.pc.config.material.domain.Material;
|
|
26
|
import com.huaheng.pc.config.material.service.MaterialService;
|
|
27
28
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
|
|
29
30
|
import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
|
|
31
|
import com.huaheng.pc.momLog.service.IMomLogService;
|
|
32
33
34
35
36
37
38
39
|
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;
|
|
40
41
|
import com.huaheng.pc.system.user.domain.User;
import com.huaheng.pc.system.user.service.IUserService;
|
|
42
43
|
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
|
|
44
|
import io.swagger.annotations.ApiOperation;
|
|
45
46
|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
|
|
47
|
import org.springframework.beans.BeanUtils;
|
|
48
49
50
|
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
|
|
51
|
import java.io.UnsupportedEncodingException;
|
|
52
53
54
55
|
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
|
|
56
|
import java.util.*;
|
|
57
|
|
|
58
|
|
|
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
@RestController
@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;
|
|
78
79
80
|
@Resource
private TaskDetailService taskDetailService;
|
|
81
82
83
84
85
86
|
@Resource
private InventoryTransactionService inventoryTransactionService;
@Resource
private MaterialService materialService;
|
|
87
88
|
@Resource
private IMomLogService momLogService;
|
|
89
90
|
@Resource
private IMesService mesService;
|
|
91
92
|
@Resource
private IUserService userService;
|
|
93
|
|
|
94
95
96
|
@Resource
private AddressService addressService;
|
|
97
|
private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
|
|
98
|
|
|
99
100
101
102
|
@PostMapping("/receipt")
@ApiLogger(apiName = "添加入库单及其明细", from="ROBOT")
@ApiOperation("添加入库单及其明细")
public AjaxResult receipt(@RequestBody ReceiptDTO receiptDTO) {
|
|
103
104
105
106
107
|
AjaxResult ajaxResult = handleQuest("receipt", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.receipt(receiptDTO);
return ajaxResult;
|
|
108
|
}
|
|
109
110
|
});
return ajaxResult;
|
|
111
112
|
}
|
|
113
|
|
|
114
115
116
117
118
119
120
121
122
|
/**
* 添加出库单及其明细
* @param receiptDTO
* @return
*/
@PostMapping("/shipment")
@ApiLogger(apiName = "添加出库单及其明细", from="ROBOT")
@ApiOperation("添加出库单及其明细")
public AjaxResult shipment(@RequestBody ReceiptDTO receiptDTO) {
|
|
123
124
125
126
127
|
AjaxResult ajaxResult = handleQuest("shipment", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.shipment(receiptDTO);
return ajaxResult;
|
|
128
|
}
|
|
129
|
});
|
|
130
|
return ajaxResult;
|
|
131
132
|
}
|
|
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
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;
}
|
|
152
|
|
|
153
154
155
156
157
158
159
160
|
/**
* 入库单参数_判空处理
* @param ajaxResult
* @param shipmentHeader
* @param shipemtnDetails
*/
private boolean enterIsNull(AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails){
|
|
161
162
163
|
if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)){
return true;
}
|
|
164
165
166
167
168
169
170
|
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;
|
|
171
172
|
}else if (shipmentHeader.getTotalQty() == null || shipmentHeader.getTotalQty().intValue() <= 0) {
ajaxResult.setCode(RetCode.FAIL).setMsg("数量不能为空!!!");
|
|
173
174
175
176
177
|
}
shipemtnDetails.forEach(shipemtnDetail->{
if (StringUtils.isEmpty(shipemtnDetail.getMaterialCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("物料编码不能为空!!!");
|
|
178
179
|
} else if (shipemtnDetail.getTotalQty() == null || shipemtnDetail.getQty().intValue() <= 0) {
ajaxResult.setCode(RetCode.FAIL).setMsg("数量不能为空!!!");
|
|
180
181
182
183
184
185
186
187
188
189
190
191
|
}
});
return StringUtils.isNotEmpty(ajaxResult.getMsg());
}
/**
* 出库单参数_判空处理
* @param ajaxResult
* @param shipmentHeader
* @param shipemtnDetails
*/
private boolean outIsNull (AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails){
|
|
192
193
194
|
if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)){
return true;
}
|
|
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
|
if (StringUtils.isEmpty(shipmentHeader.getReferCode())) {
ajaxResult.setCode(RetCode.FAIL).setMsg("单据单号不能为空!!!");
return true;
}
shipemtnDetails.forEach(shipemtnDetail->{
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;
}
/**
|
|
224
|
* 入库单单据取消
|
|
225
|
*/
|
|
226
227
|
@PostMapping("/cancelEnterWarehouse")
@ApiOperation("入库单单据取消")
|
|
228
|
@ApiLogger(apiName = "入库单单据取消", from="ROBOT")
|
|
229
|
public AjaxResult cancelEnterWarehouse(@RequestBody ReceiptDTO receiptDTO) {
|
|
230
231
232
233
234
|
AjaxResult ajaxResult = handleQuest("cancelEnterWarehouse", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.cancelEnterWarehouse(receiptDTO);
return ajaxResult;
|
|
235
|
}
|
|
236
237
|
});
return ajaxResult;
|
|
238
239
240
241
242
243
244
245
|
}
/**
* 出库单单据取消
*/
@PostMapping("/cancelOutWarehouse")
@ApiOperation("出库单单据取消")
|
|
246
|
@ApiLogger(apiName = "出库单单据取消", from="ROBOT")
|
|
247
|
public AjaxResult cancelOutWarehouse(@RequestBody ReceiptDTO receiptDTO) {
|
|
248
249
250
251
252
|
AjaxResult ajaxResult = handleQuest("cancelOutWarehouse", new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = mesService.cancelOutWarehouse(receiptDTO);
return ajaxResult;
|
|
253
|
}
|
|
254
255
|
});
return ajaxResult;
|
|
256
257
258
259
260
261
262
263
264
265
|
}
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("总数量不能为空!!!");
}
});
|
|
266
267
268
|
if (isNull || StringUtils.isNotEmpty(ajaxResult.getMsg())){
return ajaxResult;
}
|
|
269
|
return ajaxResult;
|
|
270
271
272
273
274
275
276
277
278
279
280
281
|
}
/**
* 查询库存
*/
@PostMapping("/searchInventory")
@ApiLogger(apiName = "查询库存", from="ROBOT")
@ApiOperation("查询库存")
public AjaxResult searchInventory(@RequestBody Detail detailed) {
String materialName = detailed.getMaterialName();
String materialCode = detailed.getMaterialCode();
|
|
282
|
String containerCode = detailed.getContainerCode();
|
|
283
|
|
|
284
285
286
287
288
|
LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
// 物料编码
if (StringUtils.isNotEmpty(materialName)){
lambdaQueryWrapper.eq(InventoryDetail::getMaterialName, materialName);
}
|
|
289
|
// 物料名称
|
|
290
291
292
|
if (StringUtils.isNotEmpty(materialCode)){
lambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, materialCode);
}
|
|
293
294
295
296
|
// 托盘号
if (StringUtils.isNotEmpty(containerCode)){
lambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
}
|
|
297
|
|
|
298
299
300
|
if (StringUtils.isEmpty(materialName) && StringUtils.isEmpty(containerCode) && StringUtils.isEmpty(containerCode)){
lambdaQueryWrapper.gt(InventoryDetail::getQty, 0);
}
|
|
301
|
List<InventoryDetail> detailList = inventoryDetailService.list(lambdaQueryWrapper);
|
|
302
|
|
|
303
304
305
306
307
|
List<InventoryVO> inventoryVOList = new ArrayList<>();
detailList.forEach(detail->{
InventoryVO inventoryVO = new InventoryVO();
BeanUtils.copyProperties(detail,inventoryVO);
inventoryVO.setWarehouse("035");
|
|
308
|
inventoryVOList.add(inventoryVO);
|
|
309
310
|
});
|
|
311
|
return AjaxResult.success(inventoryVOList);
|
|
312
313
314
315
|
}
/**
|
|
316
|
* 获取出入库单明细记录
|
|
317
318
319
|
* @return AjaxResult
*/
@PostMapping("/getShipmentDetail")
|
|
320
321
|
@ApiLogger(apiName = "获取出入库单明细记录", from="ROBOT")
@ApiOperation("获取出入库单明细记录")
|
|
322
323
324
325
326
|
public AjaxResult getShipmentDetail(@RequestBody GetOrderHistoryDTO getOrderHistoryDTO) {
if(StringUtils.isEmpty(getOrderHistoryDTO.getEndTime()) || StringUtils.isEmpty(getOrderHistoryDTO.getStartTime())){
return AjaxResult.error("开始时间和结束时间不能为空!!!");
}
|
|
327
|
LambdaQueryWrapper<InventoryTransaction> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
328
|
lambdaQueryWrapper
|
|
329
330
331
332
333
334
335
336
337
338
|
.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);
|
|
339
340
341
342
343
344
345
346
347
348
349
|
}
/**
* 获取sqlServer数据库中物料信息, 同步到本地数据库中
*/
@PostMapping("/getMaterial")
@ApiOperation("获取外部物料信息")
public List<Material> getMaterial(){
List<Material> materialList = new ArrayList<>();
try {
// String sql = "SELECT * FROM [dbo].[sys_user] WHERE createTime > (select DATEADD(HOUR,-3,getdate())) AND createTime <= (select GETDATE())";
|
|
350
351
|
// String sql = "SELECT * FROM [dbo].[base_material] WHERE MaterialName = 'SMLS Pipe'";
// 获取新增一天以内和修改两个小时以内的物料数据
|
|
352
|
//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')";
|
|
353
354
355
|
//DATEDIFF() 函数返回两个日期之间的天数。
|
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
|
String sql="SELECT\n" +
"\ta.cinvcode,\n" +
"\ta.cinvname,\n" +
"\ta.cDefWareHouse,\n" +
"\ta.cComUnitCode,\n" +
"\tb.cComUnitName,\n" +
"\tc.cidefine6,\n" +
"\tc.cidefine7,\n" +
"\ta.dModifyDate,\n" +
"\ta.dSDate,\n" +
"\ta.cinvstd,\n" +
"\ta.Iinvweight,\n" +
"\ta.cinvccode,\n" +
"\td.cInvCName\n" +
"FROM\n" +
"\t[dbo].[Inventory] a\n" +
"\tLEFT JOIN [dbo].[ComputationUnit] b ON a.cComUnitCode= b.cComUnitCode\n" +
"\tLEFT JOIN [dbo].[Inventory_extradefine] c ON a.cinvcode= c.cinvcode\n" +
"\tLEFT JOIN [dbo].[InventoryClass] d on a.cinvccode= d.cinvccode \n" +
"WHERE ( datediff( DAY, a.dSDate, getdate( ) ) = 0 OR a.dModifyDate >= DATEADD( HOUR, - 4, GETDATE( ) ) ) \n" +
|
|
376
|
"\tAND a.cDefWareHouse IN ( '035', '003' ,'001')" ;
|
|
377
|
|
|
378
|
ResultSet resultSet = SqlServer.find(sql);
|
|
379
380
381
382
|
if (resultSet == null){
return materialList;
}
while(resultSet.next()){
|
|
383
|
// 字段要与海王表一致
|
|
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
String code = resultSet.getString("cInvCode");//物料编码
String name = resultSet.getString("cInvName");//物料名称
String unitName = resultSet.getString("cComUnitName");//单位名称
String physicalDimension = resultSet.getString("cidefine6");//外形尺寸
String high = resultSet.getString("cidefine7");//托盘类型
String defWareHouse = resultSet.getString("cDefWareHouse");//u8仓库
String unitCode = resultSet.getString("cComUnitCode");//单位编码
//String modifyDate = resultSet.getString("dModifyDate");//修改时间
//String startDate = resultSet.getString("dSDate");//启用时间
String spec = resultSet.getString("cinvstd");//规格
String weight = resultSet.getString("Iinvweight");//重量cinvccode
String cinvccode = resultSet.getString("cinvccode");//存货类别编码
String cInvCName = resultSet.getString("cInvCName");//存货类别名称
|
|
398
|
int isHigh = "高托".equals(high) ? 1 : 0;
|
|
399
400
|
Material material = new Material();
|
|
401
|
material.setCode(code);
|
|
402
|
material.setName(name);
|
|
403
|
material.setUnit(unitName);
|
|
404
405
|
material.setSpec(spec);
material.setIsHigh(isHigh);
|
|
406
407
|
material.setWarehouseCode("CS0001");
material.setCompanyCode("BHF");
|
|
408
409
410
411
412
413
414
415
416
|
material.setPhysicalDimension(physicalDimension);
material.setDefWareHouse(defWareHouse);
material.setUnitCode(unitCode);
//material.setModifyDate();
//material.setStartDate();
material.setWeight(weight);
material.setCinvccode(cinvccode);
material.setCInvCName(cInvCName);
|
|
417
418
419
420
421
422
|
materialList.add(material);
}
// materialService.saveBatch(materialList);
} catch (SQLException throwable) {
throwable.printStackTrace();
}
|
|
423
|
logger.debug("******************************同步海王物料档案" + materialList.size() + "条数据!!!");
|
|
424
|
return materialList;
|
|
425
|
}
|
|
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
|
/** 当前时间向推几小时 */
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);
}
/**
* 查询站台任务明细列表
*/
@ApiLogger(apiName = "查询站台任务明细列表", from="ROBOT")
@PostMapping("/kanbanInfo")
|
|
443
|
@CrossOrigin
|
|
444
445
|
public AjaxResult kanbanInfo(@RequestBody TaskDetail taskDetail){
String fromLocation = taskDetail.getFromLocation();
|
|
446
|
if (StringUtils.isEmpty(fromLocation)) {
|
|
447
|
return AjaxResult.error("站台不能为空!!!");
|
|
448
|
}
|
|
449
450
451
452
453
454
455
|
LambdaQueryWrapper<TaskDetail> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TaskDetail::getFromLocation, fromLocation)
.lt(TaskDetail::getStatus,"100");
List<TaskDetail> taskDetailList = taskDetailService.list(wrapper);
return AjaxResult.success(taskDetailList);
}
|
|
456
|
/**
|
|
457
|
* post调用E_Rd_In(MOM)入库成功接口
|
|
458
|
*/
|
|
459
|
//@ApiLogger(apiName = "post调用E_Rd_In(MOM)入库接口", from="ROBOT")
|
|
460
|
@PostMapping("/postE_Rd_In")
|
|
461
|
public ReturnInfo postE_Rd_In(@RequestBody ReceiptDetail receiptDetail){
|
|
462
|
User user = userService.selectUserByEmail(receiptDetail.getLastUpdatedBy());
|
|
463
|
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId()); //59
|
|
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", user.getLoginName());
|
|
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
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
|
Rd_In_S.put("Iquantity", receiptDetail.getTaskQty());
Rd_In_S.put("iFQuantity", receiptDetail.getQty());
Rd_In_S.put("cwhcode", receiptDetail.getWarehouseCode());
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());
Rd_In_S.put("creatorCode", receiptDetail.getLastUpdatedBy());
Rd_In_S.put("creatorName", receiptDetail.getLastUpdatedByName());
Rd_In_S.put("productionWorker", receiptHeader.getProductionWorker());
Rd_In_S.put("productionWorkerName", receiptHeader.getProductionWorkerName());
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);
|
|
499
|
return postMOM(action, json, "入库回传");
|
|
500
501
502
503
504
505
|
}
/**
* post调用E_Rd_In(MOM)其他入库成功接口
*/
|
|
506
|
//@ApiLogger(apiName = "post调用E_Rd_In(MOM)其他入库接口", from="ROBOT")
|
|
507
|
@PostMapping("/postOther_E_Rd_In")
|
|
508
|
public ReturnInfo postOther_E_Rd_In(@RequestBody List<ReceiptDetail> receiptDetails,ReceiptHeader receiptHeader){
|
|
509
510
511
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
|
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);
return postMOM("E_Rd_In", jsonObject,"其他入库回传");
|
|
552
553
554
|
}
/**
|
|
555
|
* post调用E_Rd_In(MOM)出库成功接口
|
|
556
|
*/
|
|
557
|
//@ApiLogger(apiName = "post调用E_Rd_Out(MOM)出库接口", from="ROBOT")
|
|
558
|
@PostMapping("/postE_Rd_Out")
|
|
559
|
public Boolean postE_Rd_Out(@RequestBody ShipmentHeader shipmentHeader) {
|
|
560
|
// ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentHeaderID.getId());
|
|
561
|
//StringBuffer keyField = new StringBuffer();
|
|
562
563
|
JSONArray dataArray = new JSONArray();
// 如果订单为合并类型
|
|
564
|
if ("merge".equals(shipmentHeader.getShipmentType())) {
|
|
565
|
// 查询所有子表
|
|
566
|
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
|
|
567
568
|
// 查询所有合并前的头表
String ids = shipmentHeader.getRecordID();
|
|
569
570
|
String[] headerIdArr = ids.split(",");
List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(new LambdaQueryWrapper<ShipmentHeader>().in(ShipmentHeader::getId, headerIdArr));
|
|
571
|
// 根据合并前的头表id分组
|
|
572
573
574
575
576
577
578
579
580
581
|
Map<Integer, List<ShipmentDetail>> map = new HashMap<>();
for (ShipmentDetail detail : shipmentDetailList) {
Integer key = detail.getRecordID();
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);
|
|
582
|
}
|
|
583
|
}
|
|
584
|
}
|
|
585
|
|
|
586
587
588
589
590
591
|
for (Integer key : map.keySet()) {
JSONObject data = new JSONObject();
// 合并前的头表
ShipmentHeader header = new ShipmentHeader();
// 合并前头表对应的子表
List<ShipmentDetail> detailList = new ArrayList<>();
|
|
592
593
|
for (ShipmentHeader SH : shipmentHeaderList) {
if (key.equals(SH.getId())) {
|
|
594
595
|
header = SH;
detailList = map.get(key);
|
|
596
|
break;
|
|
597
598
599
600
601
602
603
604
605
|
}
}
// 查询出库单据表头
JSONObject Rd_Out_M = getRd_Out_M(header);
JSONArray jsonArray = getRd_Out_S(header, detailList);
data.put("Rd_Out_M", Rd_Out_M);
data.put("Rd_Out_S", jsonArray);
dataArray.add(data);
}
|
|
606
|
} else {
|
|
607
608
609
|
// 查询出库单据表头
JSONObject Rd_Out_M = getRd_Out_M(shipmentHeader);
// 查询出库单据明细
|
|
610
611
|
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>()
.eq(ShipmentDetail::getShipmentId, shipmentHeader.getId()));
|
|
612
|
JSONArray jsonArray = getRd_Out_S(shipmentHeader, shipmentDetailList);
|
|
613
614
615
616
617
618
619
620
621
|
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);
|
|
622
623
|
ReturnInfo returnInfo = postMOM(action, json, "出库回传");
if (returnInfo == null) {
|
|
624
625
626
|
shipmentHeader.setErrorMsg("出库回传:接口地址错误或返回为空");
shipmentHeader.setPushSuccessStatus(2);
shipmentHeaderService.updateById(shipmentHeader);
|
|
627
|
return false;
|
|
628
|
}
|
|
629
|
shipmentHeader.setPushErrorCount(shipmentHeader.getPushErrorCount() + 1);
|
|
630
|
if (returnInfo.hasError()) {
|
|
631
|
shipmentHeader.setPushSuccessStatus(1);
|
|
632
633
|
shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
|
|
634
|
} else {
|
|
635
|
shipmentHeader.setPushSuccessStatus(2);
|
|
636
|
shipmentHeader.setErrorMsg(returnInfo.getMsg());
|
|
637
|
}
|
|
638
639
|
shipmentHeaderService.updateById(shipmentHeader);
return true;
|
|
640
641
642
|
}
|
|
643
|
public JSONArray getRd_Out_S(ShipmentHeader shipmentHeader, List<ShipmentDetail> shipmentDetailList) {
|
|
644
|
JSONArray jsonArray = new JSONArray();
|
|
645
|
shipmentDetailList.forEach(shipmentDetail->{
|
|
646
|
JSONObject Rd_Out_S = new JSONObject();
|
|
647
648
|
Rd_Out_S.put("MGPK", shipmentHeader.getMOMID());
Rd_Out_S.put("SGPK", shipmentDetail.getMOMID());
|
|
649
|
Rd_Out_S.put("SNNO", shipmentDetail.getSNNO());
|
|
650
|
Rd_Out_S.put("cInvCode", shipmentDetail.getMaterialCode());
|
|
651
652
653
654
|
// 实际入库数量
Rd_Out_S.put("Iquantity", shipmentDetail.getTaskQty());
// MOM传入的入库数量
Rd_Out_S.put("iFQuantity", shipmentDetail.getQty());
|
|
655
|
Rd_Out_S.put("cwhcode", shipmentDetail.getWarehouseCode());
|
|
656
|
Rd_Out_S.put("MOCode", shipmentDetail.getNoticeNo());
|
|
657
|
Rd_Out_S.put("ISUrgent", shipmentDetail.getIsUrgent());
|
|
658
|
Rd_Out_S.put("updatedBy", shipmentDetail.getLastUpdatedBy());
|
|
659
660
661
662
663
|
Rd_Out_S.put("warehouse", shipmentHeader.getWarehouse());
Rd_Out_S.put("warehouseName", shipmentHeader.getWarehouseName());
Rd_Out_S.put("creatorCode", shipmentDetail.getLastUpdatedBy());
Rd_Out_S.put("creatorName", shipmentDetail.getLastUpdatedByName());
Rd_Out_S.put("requestedStartDate", shipmentHeader.getRequestedStartDate());
|
|
664
665
|
jsonArray.add(Rd_Out_S);
});
|
|
666
667
|
return jsonArray;
}
|
|
668
|
|
|
669
|
public JSONObject getRd_Out_M(@RequestBody ShipmentHeader shipmentHeader) {
|
|
670
|
User user = userService.selectUserByEmail(shipmentHeader.getLastUpdatedBy());
|
|
671
|
|
|
672
673
674
675
676
677
|
JSONObject Rd_Out_M = new JSONObject();
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());
|
|
678
679
680
681
682
|
if (user==null) {
Rd_Out_M.put("UserNo", shipmentHeader.getCreatedBy());
}else {
Rd_Out_M.put("UserNo", user.getLoginName());
}
|
|
683
|
Rd_Out_M.put("warehouse", shipmentHeader.getWarehouse());
|
|
684
685
|
Rd_Out_M.put("cDepCode", "01030101");//部门编码
Rd_Out_M.put("cWhCode", shipmentHeader.getWarehouse());//仓库编码
|
|
686
|
return Rd_Out_M;
|
|
687
688
|
}
|
|
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
|
/** utf-8 转 GB2312 */
public String getGB(String action){
byte [] Rd_Out; //中间用ISO-8859-1过渡
String data = null;
try {
Rd_Out = action.getBytes("8859_1");
data = new String(Rd_Out, "GB2312"); //转换成GB2312字符
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return data;
}
/**
* @param action MOM行为
* @param JObject 行为参数
* @return
*/
|
|
708
|
public ReturnInfo postMOM(String action, JSONObject JObject, String apiName){
|
|
709
710
|
String url = addressService.selectAddress(QuantityConstant.MOM);
return CallaMOM.getMsg(action, JObject,apiName,url);
|
|
711
|
}
|
|
712
|
|
|
713
|
|
|
714
|
}
|