输送站点设备

Junjie

2023-07-25 8e9dd8e355464e5da29ab837752ce82d5379a2ed

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

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,7 +7,6 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.WmsWrk;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WmsWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -155,9 +153,14 @@
        if (wmsWrk == null) {
            return R.error();
        }
        if (wmsWrk.getWmsStatus() == WmsWrkStatusType.COMPLETE.id) {
            return R.error(wmsWrk.getWmsWrkNo() + "已完结");
        }
        Date now = new Date();
        wmsWrk.setWmsStatus(WmsWrkStatusType.COMPLETE.id);
        wmsWrk.setModiTime(new Date());
        wmsWrk.setModiTime(now);
        wmsWrk.setModiUser(getUserId());
        wmsWrk.setEndTime(now);
        wmsWrkService.updateById(wmsWrk);
        return R.ok();
    }
@@ -169,9 +172,14 @@
        if (wmsWrk == null) {
            return R.error();
        }
        if (wmsWrk.getWmsStatus() == WmsWrkStatusType.CANCEL.id) {
            return R.error(wmsWrk.getWmsWrkNo() + "已被取消");
        }
        Date now = new Date();
        wmsWrk.setWmsStatus(WmsWrkStatusType.CANCEL.id);
        wmsWrk.setModiTime(new Date());
        wmsWrk.setModiTime(now);
        wmsWrk.setModiUser(getUserId());
        wmsWrk.setEndTime(now);
        wmsWrkService.updateById(wmsWrk);
        return R.ok();
    }