diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 814d4f1..1bbb443 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -60,8 +60,8 @@ public class ToErpServiceImpl implements IToErpService { ErpParameter objectErpParameter = new ErpParameter<>(); ArrayList list = new ArrayList(); WipTransferDoc wipTransferDoc = new WipTransferDoc(); - wipTransferDoc.setDOC_NO(basJobIdService.getJobIdBy("5C21")); - wipTransferDoc.setDOC_ID_DOC_CODE("5C21"); + wipTransferDoc.setDOC_NO(basJobIdService.getJobIdBy("5C41")); + wipTransferDoc.setDOC_ID_DOC_CODE("5C41"); wipTransferDoc.setDOC_DATE(DateUtil.formatDateTime(new Date())); wipTransferDoc.setSOURCE_ID_WORK_CENTER_WORK_CENTER_CODE("QC06"); wipTransferDoc.setFROM_ADMIN_UNIT_ID_ADMIN_UNIT_CODE("EF08G"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index fb5d777..0c1663f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -113,7 +113,7 @@ public class ToWmsServiceImpl implements IToWmsService { String nw = findFirst(PATTERNS.get("NW"), trayCode); String gw = findFirst(PATTERNS.get("GW"), trayCode);; // String productId = findFirst(PATTERNS.get("ITEM_CODE"), trayCode); - String productId = "KC01001000132"; + String productId = "KC01001000327"; String bm = findFirst(PATTERNS.get("@"), trayCode); bm=bm.substring(0,bm.length()-1); String[] decode = ProcodeUtils.decode(bm); @@ -167,30 +167,6 @@ public class ToWmsServiceImpl implements IToWmsService { //创建作业标准 if ("1".equals(requestEnter.getFloor())) { //一楼入库 其它入库 和 退料入库 存在单据,需要修改单据数量 -// InStockin inStockinParam = new InStockin(); -// inStockinParam.setErpBill(erpBill); -// List inStockins = inStockinService.selectInStockinListApi(inStockinParam); -// if (CollUtil.isEmpty(inStockins)) { -// return AjaxResult.error("单据不存在"); -// } -// InStockin inStockin = inStockins.get(0); -// if ("1".equals(inStockin.getStatus()) || "2".equals(inStockin.getStatus())) { -// inStockin.setStatus("3"); -// inStockinService.updateInStockin(inStockin); -// } -// inOrOutType = inStockin.getInType(); -// inStockId = inStockin.getStockinId(); -// InStockinDetail inStockinDetailParam = new InStockinDetail(); -// inStockinDetailParam.setStockinId(inStockin.getStockinGuid()); -// inStockinDetailParam.setProductId(basProduct.getProductId()); -// List inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam); -// if (CollUtil.isEmpty(inStockinDetails)) { -// return AjaxResult.error("单据明细不存在"); -// } -// InStockinDetail inStockinDetail = inStockinDetails.get(0); -// inStockDetailId = inStockinDetail.getStockinDetailId(); -// inStockinDetail.setScanNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getScanNum()).add(Convert.toBigDecimal(1)))); -// inStockinDetailService.updateInStockinDetail(inStockinDetail); inOrOutType = "2"; }else if ("2".equals(requestEnter.getFloor())) { inOrOutType = "1"; @@ -264,13 +240,12 @@ public class ToWmsServiceImpl implements IToWmsService { } //todo 创建工艺入库单 -// if ("2".equals(requestEnter.getFloor())){ -// AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill); -// if (!workshopInboundOrder.isSuccess()){ -// //throw new RuntimeException("创建工单失败"); -// return new AjaxResult(9, "创建工艺入库单失败!"); -// } -// } + if ("2".equals(requestEnter.getFloor())){ + AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill); + if (!workshopInboundOrder.isSuccess()){ + throw new RuntimeException("创建工单失败"); + } + } //修改作业状态为正执行 result.put("jobId", mydoJob.getJobId()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index e612b9f..a3d4fd0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -321,13 +321,6 @@ public class MydoJobServiceImpl implements IMydoJobService { if (CollUtil.isNotEmpty(mydoJobDetails)) { List list = new ArrayList<>(); for (MydoJobDetail mydoJobDetail : mydoJobDetails) { -// if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) { -// //修改单据实际数量 2-退料入库 3-其它入库 -// String inOrOutDId = mydoJobDetail.getInOrOutDId(); -// InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId); -// inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity())))); -// inStockinDetailService.updateInStockinDetail(inStockinDetail); -// } //正常库存 BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1"); stockByInStockinDetail.setSpare7("0"); @@ -363,7 +356,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } transferBillCallback.setSpare3(mydoJobDetails.get(0).getSpec()); transferBillCallback.setTrayCode(mydoJob.getTrayCode()); - //transferBillCallbackService.insertTransferBillCallback(transferBillCallback); + transferBillCallbackService.insertTransferBillCallback(transferBillCallback); return AjaxResult.success(); } else { return AjaxResult.warn("不存在子作业");