| | |
| | | } |
| | | } |
| | | if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) { |
| | | agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo()); |
| | | agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo()); |
| | | if (agvLocMast != null) { |
| | | pltType = agvLocMast.getPltType(); |
| | | } |
| | | } |
| | | agvWrkMast.setPltType(pltType); |
| | | log.info("仓库编码:{}",agvWrkMast.getPltType()); |
| | | if (pltType != null) { |
| | | agvWrkMast.setPltType(pltType); |
| | | } |
| | | log.info("工作号--{},仓库编码:{}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType()); |
| | | } |
| | | agvWrkMast.setModiTime(new Date()); |
| | | //修改工作档状态为207.库存更新完成 |
| | |
| | | //货架类型 |
| | | wrkMast.setWhsType(Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2))); |
| | | |
| | | wrkMast.setAppeUser(9527L); |
| | | wrkMast.setAppeUser(agvWrkMast.getAppeUser()); |
| | | wrkMast.setAppeTime(now); |
| | | wrkMast.setModiUser(9527L); |
| | | wrkMast.setModiTime(now); |
| | |
| | | if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) { |
| | | reportMesPakinOrder(agvWrkMast, data); |
| | | } |
| | | if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) { |
| | | reportMesPakoutOrder(agvWrkMast, data); |
| | | } |
| | | if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) { |
| | | generateMesParam(agvWrkMast, data); |
| | | } |
| | | // if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) { |
| | | // reportMesPakoutOrder(agvWrkMast, data); |
| | | // } |
| | | // if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) { |
| | | // generateMesParam(agvWrkMast, data); |
| | | // } |
| | | } |
| | | |
| | | } |
| | |
| | | iteam.setLineNo(orderDetl.getItemNum()); |
| | | iteam.setSupplierCode(order.getSalesman()); |
| | | iteam.setUnit(agvWrkDetl.getUnit()); |
| | | |
| | | iteam.setRemark(agvWrkDetl.getThreeCode()); |
| | | iteams.add(iteam); |
| | | |
| | | mesBuyPakinReportParam.setCode(orderNo); |
| | |
| | | MesOrderReportParam param = new MesOrderReportParam(); |
| | | |
| | | List<MesOrderReportParam.TransferOrderItem> transferOrderItems = new ArrayList<>(); |
| | | List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>(); |
| | | List<MesOrderReportParam.RecordCustomFieldBaseCO.CustomField> customFields = new ArrayList<>(); |
| | | |
| | | //MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customFields = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField(); |
| | | |
| | | MesOrderReportParam.RecordCustomFieldBaseCO recordCustomFieldBaseCO = new MesOrderReportParam.RecordCustomFieldBaseCO(); |
| | | recordCustomFieldBaseCO.setCustomFields(customFields); |
| | | //recordCustomFieldBaseCO.setCustomFields(customFields); |
| | | param.setRecordCustomFieldBaseCO(recordCustomFieldBaseCO); |
| | | |
| | | //添加transferOrderItem属性 |
| | |
| | | transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor)); |
| | | } |
| | | transferOrderItems.add(transferOrderItem); |
| | | transferOrderItem.setInventoryDetails(inventoryDetails); |
| | | |
| | | |
| | | param.setTransferOrderItems(transferOrderItems); |
| | | |
| | | for (AgvWrkDetl agvWrkDetl : agvWrkDetls) { |
| | | List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>(); |
| | | MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail(); |
| | | //添加amount属性 |
| | | MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null); |
| | |
| | | inventoryDetail.setQcStatus(1); |
| | | inventoryDetail.setStorageStatus(1); |
| | | inventoryDetails.add(inventoryDetail); |
| | | transferOrderItem.setInventoryDetails(inventoryDetails); |
| | | //添加销售订单号 |
| | | MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim()); |
| | | customFields.add(customField); |
| | | //customFields.add(customField); |
| | | recordCustomFieldBaseCO.setCustomFields(customField); |
| | | doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1"); |
| | | } |
| | | |
| | | doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1"); |
| | | |
| | | } |
| | | |