Junjie
2023-05-22 7f9813459b89fe91db2e1f2010ee487690f3e29e
src/main/java/com/zy/asrs/controller/WmsWrkController.java
@@ -155,9 +155,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 +174,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();
    }