记录输送线异常日志

pjb

3 天以前 1e6b4d88290ccd79b51bed3acb805750a0ea7d01

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

@@ -5,14 +5,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -23,6 +24,8 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private CommonService commonService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -36,10 +39,12 @@
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(WrkMast.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){
            if (orderByField.endsWith("$")){
                orderByField = orderByField.substring(0, orderByField.length()-1);
@@ -51,14 +56,15 @@
        return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.eq(entry.getKey(), val);
            }
        }
    }
@@ -139,6 +145,9 @@
    @RequestMapping(value = "/wrkMast/add/pri/auth")
    @ManagerAuth(memo = "工作档增加优先级")
    public R addPri(@RequestBody List<WrkMast> list) {
        if (list.isEmpty()) {
            return R.error("请至少选择一行数据");
        }
        for (WrkMast entity : list){
           entity.setIoPri(entity.getIoPri() + 1);
        }
@@ -149,6 +158,9 @@
    @RequestMapping(value = "/wrkMast/red/pri/auth")
    @ManagerAuth(memo = "工作档降低优先级")
    public R redPri(@RequestBody List<WrkMast> list) {
        if (list.isEmpty()) {
            return R.error("请至少选择一行数据");
        }
        for (WrkMast entity : list){
            entity.setIoPri(entity.getIoPri() - 1);
        }
@@ -157,4 +169,52 @@
    }



    @GetMapping("/wrkMast/ioType120/list/auth")
    @ManagerAuth(memo = "站位转移任务数据")
    public R wrkMastIoType120Select(){
        List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 120));
        return R.ok().add(wrkMastList);
    }



    @PostMapping("/wrkMast/ioType120/add")
    @ManagerAuth(memo = "修改站点数据")
    public R wrkMastIoType120Add(@RequestParam Integer sourceStaNo,
                            @RequestParam Integer staNo
    ) {
        // 生成工作号
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(51L); // 工作状态：生成入库ID
        wrkMast.setIoType(120); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(0);
        wrkMast.setSourceStaNo(sourceStaNo);
        wrkMast.setStaNo(staNo);
        wrkMast.setLocNo("");
        wrkMast.setBarcode(""); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("N");
//        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setAppeUser(getUserId());
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(getUserId());
        wrkMast.setModiTime(now);
        if (!wrkMastService.insert(wrkMast)) {
//            throw new CoolException("保存工作档失败");
            return R.error().add("添加失败");
        }
        return R.ok().add("添加成功");
    }


}