mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复apms新增订单bug，优化apms接口描述

Browse Source
This commit is contained in:
徐晨晨 2021-12-28 16:07:49 +08:00
parent f3b97b9559
commit 59e480ad6a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
View File

@ -100,7 +100,7 @@ public class ApmsController extends BaseController {
* @return 删除结果 * @return 删除结果
*/ */
@PostMapping(value = "deleteBySheetNo") @PostMapping(value = "deleteBySheetNo")
@ApiOperation(value = "通知APMS删除生产单") @ApiOperation(value = "通知APMS删除生产单", hidden = true)
public R<ApmsEndProcessVo> deleteBySheetNo(@Validated @RequestBody String sheetNo) { public R<ApmsEndProcessVo> deleteBySheetNo(@Validated @RequestBody String sheetNo) {
checkToken(); checkToken();
HashMap<String, Object> paramMap = new HashMap<>(); HashMap<String, Object> paramMap = new HashMap<>();
@ -118,7 +118,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "createProcessSheet") @PostMapping(value = "createProcessSheet")
@ApiOperation(value = "通知APMS创建生产单接口") @ApiOperation(value = "通知APMS创建生产单接口", hidden = true)
public R<ApmsCreateProcessSheetVo> createProcessSheet(@Validated @RequestBody ApmsCreateProcessSheet apmsCreateProcess) { public R<ApmsCreateProcessSheetVo> createProcessSheet(@Validated @RequestBody ApmsCreateProcessSheet apmsCreateProcess) {
checkToken(); checkToken();
String paramJson = JSONUtil.toJsonStr(apmsCreateProcess); String paramJson = JSONUtil.toJsonStr(apmsCreateProcess);
@ -135,7 +135,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "startProcess") @PostMapping(value = "startProcess")
@ApiOperation(value = "通知APMS生产单开始处理") @ApiOperation(value = "通知APMS生产单开始处理", hidden = true)
public R<ApmsStartProcess> startProcess(@Validated @RequestBody ApmsStartProcess apmsStartProcess) { public R<ApmsStartProcess> startProcess(@Validated @RequestBody ApmsStartProcess apmsStartProcess) {
checkToken(); checkToken();
String paramJson = JSONUtil.toJsonStr(apmsStartProcess); String paramJson = JSONUtil.toJsonStr(apmsStartProcess);
@ -152,7 +152,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "endProcess") @PostMapping(value = "endProcess")
@ApiOperation(value = "通知APMS生产单结束处理") @ApiOperation(value = "通知APMS生产单结束处理", hidden = true)
public R<ApmsEndProcessVo> endProcess(@Validated @RequestBody ApmsEndProcess apmsEndProcess) { public R<ApmsEndProcessVo> endProcess(@Validated @RequestBody ApmsEndProcess apmsEndProcess) {
checkToken(); checkToken();
String paramJson = JSONUtil.toJsonStr(apmsEndProcess); String paramJson = JSONUtil.toJsonStr(apmsEndProcess);
@ -169,7 +169,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "finishProcessSheet") @PostMapping(value = "finishProcessSheet")
@ApiOperation(value = "通知APMS完成生产单接口") @ApiOperation(value = "通知APMS完成生产单接口", hidden = true)
public R<ApmsFinishProcessSheetVo> finishProcessSheet(@Validated @RequestBody ApmsFinishProcessSheet apmsFinishProcessSheet) { public R<ApmsFinishProcessSheetVo> finishProcessSheet(@Validated @RequestBody ApmsFinishProcessSheet apmsFinishProcessSheet) {
checkToken(); checkToken();
String paramJson = JSONUtil.toJsonStr(apmsFinishProcessSheet); String paramJson = JSONUtil.toJsonStr(apmsFinishProcessSheet);
@ -186,7 +186,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "getApmsToken") @PostMapping(value = "getApmsToken")
@ApiOperation(value = "获取APMS Token") @ApiOperation(value = "获取APMS Token", hidden = true)
public R<String> getApmsToken() { public R<String> getApmsToken() {
HashMap<String, Object> paramMap = new HashMap<>(); HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("apiKey", "7ee8f59bbaeae27e"); paramMap.put("apiKey", "7ee8f59bbaeae27e");
@ -208,7 +208,7 @@ public class ApmsController extends BaseController {
} }
@PostMapping(value = "getStoveCodeByWorkShopCode") @PostMapping(value = "getStoveCodeByWorkShopCode")
@ApiOperation(value = "WMS通过APMS使用车间编码获取炉号信息") @ApiOperation(value = "WMS通过APMS使用车间编码获取炉号信息", hidden = true)
public R<ApmsStoveVo> getStoveCodeByWorkShopCode(String workShopCode) { public R<ApmsStoveVo> getStoveCodeByWorkShopCode(String workShopCode) {
checkToken(); checkToken();
HashMap<String, Object> paramMap = new HashMap<>(); HashMap<String, Object> paramMap = new HashMap<>();

8
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
View File

@ -81,11 +81,17 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
@Autowired @Autowired
ApmsController apmsControl; ApmsController apmsControl;
private void setCommon(OrderInfo communicationLog) {
communicationLog.setValid(WhetherEnum.YES.getValue());
communicationLog.setCreateTime(LocalDateTime.now());
communicationLog.setUpdateTime(LocalDateTime.now());
}
@Override @Override
public R<String> apmsPostOrder(OrderParamForApms apmsPostOrderParam) { public R<String> apmsPostOrder(OrderParamForApms apmsPostOrderParam) {
OrderInfo orderInfo = new OrderInfo(); OrderInfo orderInfo = new OrderInfo();
BeanUtils.copyProperties(apmsPostOrderParam, orderInfo); BeanUtils.copyProperties(apmsPostOrderParam, orderInfo);
setCommonField(orderInfo); setCommon(orderInfo);
//设定来源信息为apms //设定来源信息为apms
orderInfo.setOrderSource(OrderSourceEnum.APMS.getValue()); orderInfo.setOrderSource(OrderSourceEnum.APMS.getValue());
orderInfo.setInterCode(IDGenerator.gen("DD", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "ORDER_CODE")); orderInfo.setInterCode(IDGenerator.gen("DD", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "ORDER_CODE"));

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskDetVo.java
View File

@ -87,7 +87,7 @@ public class CurrTaskDetVo extends BaseVo implements PageVo.ConvertVo {
* 单位 * 单位
*/ */
@ApiModelProperty("单位") @ApiModelProperty("单位")
private Float unit; private String unit;
/** /**
* 数量，手动输入 * 数量，手动输入