#

zjj

2024-10-29 d0d0224f72333576d81d2cf1ac19e6f3e58c093f

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

@@ -10,12 +10,14 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +56,41 @@
    private PackService packService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private CommonService commonService;

    @RequestMapping("/select/workDetl/barcode")
    @ManagerAuth
    public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
        String barcode = map.get("barcode").toString();
        if (Cools.isEmpty(barcode)) {
            return R.error("条码为空");
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (Cools.isEmpty(wrkMast)) {
            return R.error("未找到任务");
        }
        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 103) {
            return R.error("任务状态有误");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        if (Cools.isEmpty(wrkDetls)) {
            return R.error("工作明细有误");
        }
        return R.ok(wrkDetls);

    }

    @RequestMapping("/leftovers/out")
    @ManagerAuth
    public R leftoversOut(@RequestBody Map<String,Object> map) {
        mobileService.leftoversOut(map,getUserId());


        return R.ok();
    }

    // 商品上架
    @RequestMapping("/mat/onSale/auth")
@@ -118,10 +154,10 @@
                }
                DocType docType = docTypeService.selectById(order.getDocType());
                if (docType.getPakin() == null || docType.getPakin() != 1) {
                    return R.ok();
                    continue;
                }
                if (order.getSettle() > 2) {
                    return R.ok();
                    continue;
                }
                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetls)) {
@@ -130,7 +166,9 @@
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme());
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -212,6 +250,31 @@
            wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
            return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
        }
        return R.ok();
    }

    /**
     * 出库确认 - 扫货物  广德宜科版
     * 1.全板 返回 101
     * 2.拣料 返回 103
     */
    @RequestMapping("/pakout/confirm/goods/auth")       //待完善  原因（客户未给出详细信息）
    @ManagerAuth
    public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
        if (Cools.isEmpty(combParam)) {
            return R.ok();
        }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetl)){
            return R.error("未查到数据");
        }
        if (!orderDetl.getQty$().equals("已完成")){
            return R.error("任务未完成");
        }
        //复核数
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        return R.ok();
    }

@@ -381,4 +444,49 @@
        return R.ok("出库成功");
    }

    @RequestMapping("/ddd/ddd")
    @ManagerAuth()
    public R ddd() {
        int w = 64;
        for (int i = 17; i <= 37; i++) {
        for (int j = 1;j<=14;j++){
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
//            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
            if (locMast.getGro1() == 999){
                continue;
            }
//            locMast.setGro1(w);
            locMast2.setGro1(locMast.getGro1()+100);
            locMast3.setGro1(locMast.getGro1()+200);
//            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
            locMastService.updateById(locMast2);
            locMastService.updateById(locMast3);
//            locMastService.updateById(locMast4);
            w++;
        }
        }
//        for (int i = 17; i <=37; i++) {
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
////            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
////            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
////            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
//            locMast.setGro1(w);
////            locMast2.setGro1(w);
////            locMast3.setGro1(w);
////            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
////            locMastService.updateById(locMast2);
////            locMastService.updateById(locMast3);
////            locMastService.updateById(locMast4);
//            w++;
//        }
        return R.ok();

    }



}