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 0b291d6..fb5d777 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 = "KC01001000145"; + String productId = "KC01001000132"; String bm = findFirst(PATTERNS.get("@"), trayCode); bm=bm.substring(0,bm.length()-1); String[] decode = ProcodeUtils.decode(bm); 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 5314524..e612b9f 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 @@ -189,9 +189,9 @@ public class MydoJobServiceImpl implements IMydoJobService { if (job == null) { return AjaxResult.warn("任务不存在"); } - if (!"1".equals(job.getStatus())) { - return AjaxResult.warn("只能作废未开始的任务"); - } +// if (!"1".equals(job.getStatus())) { +// return AjaxResult.warn("只能作废未开始的任务"); +// } if ("1".equals(job.getInOrOut())) { mydoJob.setStatus("5"); updateMydoJob(mydoJob);