From 3ac9f524f1f751015a3882f08d631233208953dc Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期二, 30 一月 2024 08:57:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 4347bc1..8aae7d5 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -95,7 +95,7 @@ }else if (param.getIoType() == 3){ taskWrk.setWrkSts(11); if (!Cools.isEmpty(param.getStartPoint())) { - taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣 + taskWrk.setStartPoint(param.getStartPoint());//璧风偣 taskWrk.setOriginStartPoint(param.getStartPoint()); } } @@ -150,7 +150,7 @@ ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply" ,null ,"127.0.0.1" - ,JSON.toJSONString(param) + ,JSON.toJSONString(toWmsDTO) ,response ,true ); @@ -175,12 +175,19 @@ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("crn_no",data.getTaskTunnel()) .eq("type_no",1) - .lt("crn_stn",200)); + .lt("stn_no",200)); + }else if (param.getWharfSource().contains("H")){ + staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() + .eq("crn_no",data.getTaskTunnel()) + .eq("type_no",1) + .lt("stn_no",400) + .gt("stn_no",200)); }else { staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("crn_no",data.getTaskTunnel()) .eq("type_no",1) - .ge("crn_stn",200)); + .lt("stn_no",500) + .ge("stn_no",400)); } map1.put("taskTunnel", staDesc.getStnDesc()); //map1.put("taskTunnel", "J-1104"); -- Gitblit v1.9.1