diff --git a/src/main/java/com/heai/common/utils/Constant.java b/src/main/java/com/heai/common/utils/Constant.java index 867596f..540934b 100644 --- a/src/main/java/com/heai/common/utils/Constant.java +++ b/src/main/java/com/heai/common/utils/Constant.java @@ -126,5 +126,5 @@ public class Constant { public static final String BAG = "BAG"; public static final String QTY = "QTY"; public static final String CARTON = "CARTON"; - public static final String QTY_BAG = "BAG/QTY"; + public static final String QTY_BAG = "QTY/BAG"; } diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java index 723712e..5aec8d2 100644 --- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java +++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java @@ -579,20 +579,16 @@ public class BoardServiceImpl implements BoardService { throw new RuntimeException("派工单未查询到标签信息"); } PackagePrintData packagePrintData = list.get(0); -// String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo()); -// if (!"PACKING".equals(workCenterProLine)){ -// throw new RuntimeException("该派工单工序不是包装工序"); -// } if (Objects.nonNull(number)){ packagePrintData.setUnitQty(number.doubleValue()); } Map map = boardMapper.getCustomerInfo(site,orderNo); if ("TBC".equals(map.get("CustomerGroup"))){ packagePrintData.setKeyInfoStr1(map.get("LogoFileName")); - packagePrintData.setKeyInfoStr1(map.get("CustomerDesc")); + packagePrintData.setKeyInfoStr2(map.get("CustomerDesc")); }else { packagePrintData.setKeyInfoStr1("AMLogo.jpg"); - packagePrintData.setKeyInfoStr1("A&M Polymer"); + packagePrintData.setKeyInfoStr2("A&M Polymer"); } switch (map.get("ABC")){ case "A": diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index f0a0d65..46bd57a 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -516,6 +516,13 @@ public class DailyPlanController { List resultList = dailyPlanService.getSOScheduleRoutingDataPrint(inData); R r = R.ok().put("rows", resultList).put("total", resultList.size()); if (!resultList.isEmpty()){ + if (Objects.isNull(resultList.get(0).getPreviousSeqNo())){ + throw new RuntimeException("派工单未扫描对接"); + } + SOScheduledRoutingOutData outData = new SOScheduledRoutingOutData(); + outData.setSeqNo(resultList.get(0).getPreviousSeqNo()); + List print = dailyPlanService.getSOScheduleRoutingDataPrint(outData); + r.put("data",print.get(0)); r.put("row",dailyPlanService.packagingParameters(resultList.get(0).getSite(),resultList.get(0).getPartNo())); } return r;