#

zhou zhou

昨天 35173cda98e2be25cf30a028697e6d363f8c4f77

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -22,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +36,11 @@
@RequestMapping("mobile")
@Slf4j
public class MobileController extends BaseController  {

    private static final boolean auth = true;
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};

    @Autowired
    private MobileService mobileService;
@@ -70,6 +77,39 @@
//
//
//    }
@RequestMapping("/agv/staBind")
@ManagerAuth(memo = "AGV站点绑定物料")
public R pdaAgvStaBind(@RequestBody CombParam combParam){
    if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
        throw new CoolException(BaseRes.PARAM);
    }

    mobileService.AgvStaBind(combParam,getUserId());

    return R.ok();

}
    @PostMapping("/agv/finishedCall")
    @ManagerAuth
    public R pdaAgvFinishedCall(@RequestBody Map<String,Object> map){
        return mobileService.FinishedCall(map);
    }
    @PostMapping("/agv/agv2fPack")
    @ManagerAuth
    public R pdaAgv2fPack(@RequestBody Map<String,Object> map){
        return mobileService.agv2fPack(map);
    }
    @PostMapping("/agv/lineCall")
    @ManagerAuth
    public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
        return mobileService.lineCall(map);
    }

    @GetMapping("/agv/site/list")
    @ManagerAuth
    public R pdaAgvSiteList(){
        return mobileService.siteList();
    }


    @PostMapping("/agv/start")
@@ -285,7 +325,7 @@
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", combParam.getBarcode())
                .eq("io_type", 104)
                .eq("wrk_sts", 14));
                .in("wrk_sts", 14,105));
        if (Cools.isEmpty(wrkMast)) {
            mobileService.comb(combParam, getUserId());
            return R.ok("组托成功");
@@ -295,6 +335,59 @@
        }


    }

    @RequestMapping("/pingKu/Shelves/auth")
    @ManagerAuth(memo = "平库上架")
    public R pingKuShelves(@RequestBody CombParam combParam){
        if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        mobileService.pingKuShelves(combParam, getUserId());

        return R.ok();
    }

    @RequestMapping("/pingKu/unShelves/auth")
    @ManagerAuth(memo = "平库下架")
    public R pingKuUnShelves(@RequestBody CombParam combParam){
        if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        mobileService.pingKuUnShelves(combParam, getUserId());

        return R.ok();
    }

    @RequestMapping("/pingKu/getList/auth")
    @ManagerAuth(memo = "平库获取库存列表")
    @AppAuth(memo = "平库获取库存列表")
    public R pingKuGetList(@RequestBody PKInventoryAdjustment combParam){
        auth("", combParam, request);
        if (Cools.isEmpty(combParam.getLocno())) {
            throw new CoolException(BaseRes.PARAM);
        }
        List<ManLocDetl> manLocDetls = mobileService.pingKuGetList(combParam);

        return R.ok(manLocDetls);
    }

    @RequestMapping("/pingKu/inventoryAdjustment/auth")
    @ManagerAuth(memo = "库存调整")
    @AppAuth(memo = "库存调整")
    public R pingKuInventoryAdjustment(@RequestBody PKInventoryAdjustment combParam, HttpServletRequest request){
        auth("", combParam, request);
        if (Cools.isEmpty(combParam.getLocno())) {
            throw new CoolException(BaseRes.PARAM);
        }
        mobileService.pingKuInventoryAdjustment(combParam);

        return R.ok();
    }

    private void auth(String appkey, Object obj, HttpServletRequest request) {
//            log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
    }

    @RequestMapping("/pack/get/auth")
@@ -572,20 +665,20 @@
    @RequestMapping("/ddd/ddd")
    @ManagerAuth()
    public R ddd() {
        int w = 64;
        int w = 99999;
        for (int i = 17; i <= 37; i++) {
        for (int j = 1;j<=3;j++){
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", j));
            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", j));
        for (int j = 8;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;
//            }
            if (locMast.getGro1() == 999){
                continue;
            }
//            locMast.setGro1(w);
//            locMast.setGro1(locMast.getGro1()+1000);
            locMast2.setGro1(locMast2.getGro1()+10000);
            locMast3.setGro1(locMast3.getGro1()+2000);
            locMast2.setGro1(locMast.getGro1()+1000);
            locMast3.setGro1(locMast.getGro1()+2000);
//            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
            locMastService.updateById(locMast2);
@@ -595,19 +688,23 @@
        }
        }
//        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 locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
//            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
//            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).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);
//            if (!Cools.isEmpty(locMast)) {
//                locMast.setGro1(w);
//                locMastService.updateById(locMast);
//            }
//
//            locMast2.setGro1(w);
//            locMast3.setGro1(w);
////            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
////            locMastService.updateById(locMast2);
////            locMastService.updateById(locMast3);
//
//            locMastService.updateById(locMast2);
//            locMastService.updateById(locMast3);
////            locMastService.updateById(locMast4);
//            w++;
////            w++;
//        }
        return R.ok();