| | |
| | | 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(); |
| | | } |
| | |
| | | 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(); |
| | | } |