| | |
| | | @Override |
| | | public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) { |
| | | |
| | | if (Cools.isEmpty(param)) { |
| | | if (Cools.isEmpty(param,param.getMatList())) { |
| | | throw new CoolException("请求参数不能为空:" + param); |
| | | } |
| | | if (Cools.isEmpty(param.getBarcode())) { |
| | |
| | | // 生成工作档 |
| | | WrkMast wrkMast = new WrkMast(); |
| | | wrkMast.setWrkNo(workNo); |
| | | wrkMast.setWhsType(1); // 返修入库标识 |
| | | wrkMast.setIoTime(new Date()); |
| | | wrkMast.setWrkSts(1L); // 工作状态:设备上走 |
| | | wrkMast.setIoType(iotype); // 入出库状态:1.入库 |
| | |
| | | pushFxrkToMes(param); |
| | | |
| | | // 返回GWCS目标信息 |
| | | openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "二楼返修入库推送gwcs"); |
| | | openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "一楼返修入库推送gwcs"); |
| | | |
| | | return R.ok("反修入库成功"); |
| | | } |
| | |
| | | return R.ok("调整成功"); |
| | | } |
| | | |
| | | @Override |
| | | public R pdaFhhd(PdaDhhdParam param, Long userId) { |
| | | |
| | | String orderNo = param.getOrderNo(); |
| | | |
| | | Order order = orderService.selectByNo(orderNo); |
| | | if (order == null) { |
| | | return R.parse("单据编号不存在:" + orderNo); |
| | | } else if (!order.getSettle().equals(4L)) { |
| | | return R.parse("单据状态不为4.已完成"); |
| | | } |
| | | |
| | | order.setSettle(5L); |
| | | order.setUpdateBy(userId); |
| | | order.setUpdateTime(new Date()); |
| | | |
| | | orderService.updateById(order); |
| | | |
| | | return R.ok("发货核对成功"); |
| | | } |
| | | |
| | | // 同步盘点异常调整结果给mes |
| | | void kctzPushMes(JSONObject jsonObject) { |
| | | // 接口请求结果 |