diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java index c576794..9039b79 100644 --- a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java @@ -254,7 +254,7 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { }else { productionArea = issureNotifyMapper.getProductAreaByPlanner(data.getSite(), rows.get(0).getPlannerBuyer()); } - data.setProductionArea(productionArea==null?productionArea:"Z301"); + data.setProductionArea(productionArea!=null?productionArea:"Z301"); data.setPushWmsFlag("N"); data.setTransportFlag("N"); data.setOutWorkOrderFlag("N"); @@ -746,12 +746,12 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { throw new RuntimeException(e); } String productionArea; - if(parentItem.getFgPartNo().contains("-")) { + if(parentItem.getFgPartNo().startsWith("3")||parentItem.getFgPartNo().startsWith("7")) { productionArea = "Z112"; }else { productionArea = issureNotifyMapper.getProductAreaByPlanner(parentItem.getSite(), rows.get(0).getPlannerBuyer()); } - parentItem.setProductionArea(productionArea==null?productionArea:"Z301"); + parentItem.setProductionArea(productionArea!=null?productionArea:"Z301"); parentItem.setPushWmsFlag("N"); parentItem.setTransportFlag("N"); parentItem.setOutWorkOrderFlag("N");