工作历史档可搜索返修品

pang.jiabao

2024-12-21 7a3227174bde55918aef6f411489d0dd24c3b129

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

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -12,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
@@ -19,8 +20,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -54,6 +55,14 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private RgvOneSignService rgvOneSignService;

    @Resource
    private OrderMapper orderMapper;

    @Resource
    private OrderDetlMapper orderDetlMapper;


    // 商品上架
@@ -72,10 +81,14 @@
    }

    @RequestMapping("/search/sign/auth/v2")
//    @ManagerAuth(memo = "拆叠盘模式切换")
    @ManagerAuth(memo = "拆叠盘模式切换")
    public R orderSearchByBarcodeV2(@RequestParam boolean sign){
        Integer signRu = 1;
        return R.ok(signRu);
        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
        if (sign){
            rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
            rgvOneSignService.updateById(rgvOneSign);
        }
        return R.ok(rgvOneSign.getRgvOneSign());
    }


@@ -258,12 +271,12 @@
        return R.ok();
    }

    @RequestMapping("/truss/auth")
    @ManagerAuth(memo = "退库，1楼桁架退库")
    public R trussComb(@RequestBody TrussCombParam combParam){
        mobileService.trussComb(combParam, getUserId());
        return R.ok("组托成功");
    }
//    @RequestMapping("/truss/auth")
//    @ManagerAuth(memo = "退库，1楼桁架退库")
//    public R trussComb(@RequestBody TrussCombParam combParam){
//        mobileService.trussComb(combParam, getUserId());
//        return R.ok("组托成功");
//    }

    @RequestMapping("/truss/order/auth")
    @ManagerAuth(memo = "退库，1楼桁架退库，退库单退库")
@@ -272,12 +285,33 @@
        return R.ok("组托成功");
    }

//    @RequestMapping("/truss/comd/auth")
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库")
//    public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
//        mobileService.trussComb2(combParam, getUserId());
//        return R.ok("组托成功");
//    }
    @RequestMapping("/truss/comd/auth")
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库 wms入库")
    public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
        mobileService.PalletizingCompleteTwoFloorParam(combParam);
        return R.ok("组托成功");
    }

    /**
     * 中控：2楼212叫托盘
     */
    @PostMapping("/balcony/complete/car/auth/v1")
//    @AppAuth(memo = "中控：2楼212叫托盘")
    public synchronized R balconyCompleteCar() {
        mobileService.trussComb2Car(212);
        return R.ok();
    }

    /**
     * 中控：获取箱型编号
     */
    @PostMapping("/box/type/complete/auth/v1")
//    @AppAuth(memo = "中控：获取箱型编号")
    public synchronized R boxTypeCompleteCar() {
        List<Map<String, Object>> maps = mobileService.boxTypeComb();
        return R.ok().add(maps);
    }


    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
@@ -518,4 +552,77 @@
        return R.ok("出库成功");
    }

    @PostMapping("/ckfh/auth")
    @ManagerAuth(memo = "出库复核确认")
    public synchronized R pakoutFhqr(@RequestBody PdckqrParam param) {
        // 根据工作号确认复核
        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){
            return R.parse(BaseRes.PARAM);
        }
        return mobileService.pakoutFhqr(param);
    }

    @PostMapping("/pdckqr/auth")
    @ManagerAuth(memo = "盘点出库确认")
    public synchronized R pdckqr(@RequestBody PdckqrParam param) {
        // 根据工作号确认复核
        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) ||  Cools.isEmpty(param.getMaterials())){
            return R.parse(BaseRes.PARAM);
        }
        return mobileService.pdckqr(param);
    }

    @PostMapping("/pdtz/auth")
    @ManagerAuth(memo = "盘点异常按实物调整库存信息")
    public synchronized R pdtz(@RequestBody PdtzParam param) {
        return mobileService.pdtz(param);
    }

    @PostMapping("/pdaWarehousingNow")
    @ManagerAuth(memo = "pda组托立即入库")
    public synchronized R pdaWarehousingNow(@RequestBody PdaWarehousingNowParam param) {

        // 根据工作号确认复核
        if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) ||  Cools.isEmpty(param.getSourceStaNo())){
            return R.parse(BaseRes.PARAM);
        }
        return mobileService.pdaWarehousingNow(param, getUserId());

    }


    @PostMapping("/pdaFxprk")
    @ManagerAuth(memo = "pda反修品入库")
    public synchronized R pdaFxprk(@RequestBody GwmsGenerateInventoryDto param) {

        return mobileService.pdaFxprk(param, getUserId());
    }

    @PostMapping("/pdaFhhd")
    @ManagerAuth(memo = "pda发货核对")
    public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) {

        if (Cools.isEmpty(param)) {
            return R.parse("参数有误，请检查参数");
        }

        return mobileService.pdaFhhd(param, getUserId());
    }

    @GetMapping("/getOrderNoList/{orderNo}")
    @ManagerAuth(memo = "按单据编号模糊查询单据")
    public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) {

        return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo));

    }

    @GetMapping("/getOrderDetlByOrderNo/{orderNo}")
    @ManagerAuth(memo = "按单据编号查询单据明细")
    public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) {

        return R.ok(orderDetlMapper.selectDetlList(orderNo));

    }

}