对接

zhang

2025-09-23 839dde0f9ac90050f24226b59131945cddb14b92

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -280,7 +280,7 @@
                    wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                }
                if(wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
                    wrkMast.setWrkSts(16L);//下架完成等待回库
                    wrkMast.setWrkSts(34L);//下架完成等待回库
                }else {
                    wrkMast.setWrkSts(15L);
                }
@@ -839,8 +839,17 @@
        rcsParam.put("slotCode", sourceStaNo);
        rcsParam.put("carrierCategory", "PALLET");
        rcsParam.put("carrierType", barcodeType);//11为小托盘   21为大托盘
if(sourceStaNo.equals("101")){
    rcsParam.put("carrierDir","0");
}else  if(sourceStaNo.equals("R01")||sourceStaNo.equals("R03")){
    rcsParam.put("carrierDir","-90");

        rcsParam.put("carrierDir",sourceStaNo.equals("101")? "0":"180");
    }else  if(sourceStaNo.equals("R02")){
    rcsParam.put("carrierDir","90");
}else {
    rcsParam.put("carrierDir","180");
}

        rcsParam.put("temporary", "");
        rcsParam.put("invoke", invoke);

@@ -915,6 +924,10 @@
            if (wrkMast.getWrkSts()>30){
                return R.error("该托盘={},没有下架，请下架后再回库！！！");
            }
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).in("io_type",101,103,105,107).lt("wrk_sts", 33));
            if (!Cools.isEmpty(wrkMasts)){
                return R.error(wrkMast.getCrnNo()+"堆垛机,有出库任务，禁止回库！！！");
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            String format = sdf.format(new Date());
            String s = format+"-" + wrkMast.getWrkNo() + "-" + wrkMast.getBarcode();