#

zjj

2024-03-15 dbae31a7a7cd59048ada9b51fe8faff545324c59

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -7,16 +7,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.ToWmsDTO;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
@@ -48,6 +43,11 @@
    @Autowired
    private StaDescService staDescService;

    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private LocMastService locMastService;



    @Value("${wms.url}")
@@ -61,6 +61,22 @@

    @Override
    public R taskCreate(taskCreateParam param) {
        //禁用堆垛机后不可下发任务
//        BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", param.getCrn()));
//        if ((param.getIoType() == 3 || param.getIoType() == 1 ) && basCrnp.getInEnable().equals("N")){
//            throw new CoolException("生成任务失败，堆垛机不可用");
//        } else if (param.getIoType() == 2 && basCrnp.getOutEnable().equals("N")) {
//            throw new CoolException("生成任务失败，堆垛机不可用");
//        }
        //禁用库位后不可下发出库任务
        if (param.getIoType() == 2){
            String wcsLocNo = Utils.getWcsLocNo(param.getStartPoint());
            LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
            if (locMast.getLocSts().equals("J")){
                throw new CoolException("生成出库任务失败，库位被禁用");
            }
        }

        TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
        if (taskWrk != null) {
            throw new CoolException(param.getTaskNo() + "任务已存在，请勿重复提交");
@@ -150,7 +166,7 @@
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
                ,JSON.toJSONString(param)
                ,JSON.toJSONString(toWmsDTO)
                ,response
                ,true
        );
@@ -175,12 +191,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");
@@ -270,6 +293,16 @@
                    if (Cools.isEmpty( map.get(inSta.getStaNo()))){
                        continue;
                    }
                    BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
                    if (Cools.isEmpty(crnp)){
                        continue;
                    }
                    if (crnp.getInEnable().equals("N")){
                        continue;
                    }
                    if (crnp.getCrnSts()!=3){
                        continue;
                    }
                    list.add( map.get(inSta.getStaNo()));
                }
            }
@@ -306,6 +339,16 @@
                    if (Cools.isEmpty( map.get(inSta.getStaNo()))){
                        continue;
                    }
                    BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
                    if (Cools.isEmpty(crnp)){
                        continue;
                    }
                    if (crnp.getInEnable().equals("N")){
                        continue;
                    }
                    if (crnp.getCrnSts()!=3){
                        continue;
                    }
                    list.add( map.get(inSta.getStaNo()));
                }
            }