Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单管理模块(增加权限)

Browse Source
highway
wws 1 year ago
parent c41b56b0f3
commit ad913f3f56
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File

13
op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class ProOrderController extends BaseController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
@Log(title = "订单信息", businessType = BusinessType.IMPORT) @Log(title = "导入订单信息", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception { public AjaxResult importData(MultipartFile file) throws Exception {
// 创建接收对象 // 创建接收对象
@ -68,6 +68,7 @@ public class ProOrderController extends BaseController {
* @throws IOException * @throws IOException
*/ */
@PostMapping("/importTemplate") @PostMapping("/importTemplate")
@Log(title = "生成订单模板", businessType = BusinessType.EXPORT)
public void importTemplate(HttpServletResponse response) throws IOException { public void importTemplate(HttpServletResponse response) throws IOException {
ExcelUtil<ProOrder> util = new ExcelUtil<>(ProOrder.class); ExcelUtil<ProOrder> util = new ExcelUtil<>(ProOrder.class);
@ -120,6 +121,8 @@ public class ProOrderController extends BaseController {
* @return * @return
*/ */
@PostMapping("/subSplitOrder") @PostMapping("/subSplitOrder")
@RequiresPermissions("mes:pro:order:add")
@Log(title = "提交拆分订单", businessType = BusinessType.INSERT)
public AjaxResult subSplitOrder(@RequestBody SplitOrderDTO splitOrderDTO) { public AjaxResult subSplitOrder(@RequestBody SplitOrderDTO splitOrderDTO) {
return proOrderService.subSplitOrder(splitOrderDTO); return proOrderService.subSplitOrder(splitOrderDTO);
} }
@ -158,7 +161,7 @@ public class ProOrderController extends BaseController {
* 导出订单列表 * 导出订单列表
*/ */
@RequiresPermissions("mes:pro:order:export") @RequiresPermissions("mes:pro:order:export")
@Log(title = "订单", businessType = BusinessType.EXPORT) @Log(title = "导出订单列表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ProOrder proOrder) { public void export(HttpServletResponse response, ProOrder proOrder) {
List<ProOrder> list = proOrderService.selectProOrderList(proOrder); List<ProOrder> list = proOrderService.selectProOrderList(proOrder);
@ -179,7 +182,7 @@ public class ProOrderController extends BaseController {
* 新增订单 * 新增订单
*/ */
@RequiresPermissions("mes:pro:order:add") @RequiresPermissions("mes:pro:order:add")
@Log(title = "订单", businessType = BusinessType.INSERT) @Log(title = "新增订单", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ProOrder proOrder) { public AjaxResult add(@RequestBody ProOrder proOrder) {
return toAjax(proOrderService.insertProOrder(proOrder)); return toAjax(proOrderService.insertProOrder(proOrder));
@ -202,7 +205,7 @@ public class ProOrderController extends BaseController {
* 修改订单 * 修改订单
*/ */
@RequiresPermissions("mes:pro:order:edit") @RequiresPermissions("mes:pro:order:edit")
@Log(title = "订单", businessType = BusinessType.UPDATE) @Log(title = "修改订单", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ProOrder proOrder) { public AjaxResult edit(@RequestBody ProOrder proOrder) {
return toAjax(proOrderService.updateProOrder(proOrder)); return toAjax(proOrderService.updateProOrder(proOrder));
@ -212,7 +215,7 @@ public class ProOrderController extends BaseController {
* 删除订单 * 删除订单
*/ */
@RequiresPermissions("mes:pro:order:remove") @RequiresPermissions("mes:pro:order:remove")
@Log(title = "订单", businessType = BusinessType.DELETE) @Log(title = "删除订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) { public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(proOrderService.deleteProOrderByIds(ids)); return toAjax(proOrderService.deleteProOrderByIds(ids));

16
op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java
Unescape Escape View File

@ -53,6 +53,8 @@ public class ProOrderWorkorderController extends BaseController {
* @return * @return
*/ */
@PostMapping("/subChangeWorkOrder") @PostMapping("/subChangeWorkOrder")
@RequiresPermissions("mes:pro:workorder:edit")
@Log(title = "修改工单", businessType = BusinessType.UPDATE)
public AjaxResult subChangeWorkOrder(@RequestBody SplitOrderDTO splitOrderDTO){ public AjaxResult subChangeWorkOrder(@RequestBody SplitOrderDTO splitOrderDTO){
return proOrderWorkorderService.subChangeWorkOrder(splitOrderDTO); return proOrderWorkorderService.subChangeWorkOrder(splitOrderDTO);
} }
@ -82,7 +84,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 查询生产工单列表 * 查询生产工单列表
*/ */
@RequiresPermissions("mes:proworkorder:list") @RequiresPermissions("mes:pro:proworkorder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(ProOrderWorkorder proOrderWorkorder) { public TableDataInfo list(ProOrderWorkorder proOrderWorkorder) {
startPage(); startPage();
@ -93,7 +95,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 导出生产工单列表 * 导出生产工单列表
*/ */
@RequiresPermissions("mes:proworkorder:export") @RequiresPermissions("mes:pro:workorder:export")
@Log(title = "生产工单", businessType = BusinessType.EXPORT) @Log(title = "生产工单", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ProOrderWorkorder proOrderWorkorder) { public void export(HttpServletResponse response, ProOrderWorkorder proOrderWorkorder) {
@ -105,7 +107,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 获取生产工单详细信息 * 获取生产工单详细信息
*/ */
@RequiresPermissions("mes:proworkorder:query") @RequiresPermissions("mes:pro:workorder:query")
@GetMapping(value = "/{workorderId}") @GetMapping(value = "/{workorderId}")
public AjaxResult getInfo(@PathVariable("workorderId") String workorderId) { public AjaxResult getInfo(@PathVariable("workorderId") String workorderId) {
return success(proOrderWorkorderService.selectProOrderWorkorderByWorkorderId(workorderId)); return success(proOrderWorkorderService.selectProOrderWorkorderByWorkorderId(workorderId));
@ -114,7 +116,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 新增生产工单 * 新增生产工单
*/ */
@RequiresPermissions("mes:proworkorder:add") @RequiresPermissions("mes:pro:workorder:add")
@Log(title = "生产工单", businessType = BusinessType.INSERT) @Log(title = "生产工单", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ProOrderWorkorder proOrderWorkorder) { public AjaxResult add(@RequestBody ProOrderWorkorder proOrderWorkorder) {
@ -124,7 +126,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 修改生产工单 * 修改生产工单
*/ */
@RequiresPermissions("mes:proworkorder:edit") @RequiresPermissions("mes:pro:workorder:edit")
@Log(title = "生产工单", businessType = BusinessType.UPDATE) @Log(title = "生产工单", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ProOrderWorkorder proOrderWorkorder) { public AjaxResult edit(@RequestBody ProOrderWorkorder proOrderWorkorder) {
@ -134,7 +136,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 删除生产工单 * 删除生产工单
*/ */
@RequiresPermissions("mes:proworkorder:remove") @RequiresPermissions("mes:pro:workorder:remove")
@Log(title = "生产工单", businessType = BusinessType.DELETE) @Log(title = "生产工单", businessType = BusinessType.DELETE)
@DeleteMapping("/{workorderIds}") @DeleteMapping("/{workorderIds}")
public AjaxResult remove(@PathVariable String[] workorderIds) { public AjaxResult remove(@PathVariable String[] workorderIds) {
@ -146,7 +148,7 @@ public class ProOrderWorkorderController extends BaseController {
/** /**
* 下发生产工单 * 下发生产工单
*/ */
@RequiresPermissions("mes:proworkorder:edit") @RequiresPermissions("mes:pro:workorder:edit")
@Log(title = "下发生产工单", businessType = BusinessType.OTHER) @Log(title = "下发生产工单", businessType = BusinessType.OTHER)
@PostMapping("/downWorkorder/{workorderIds}") @PostMapping("/downWorkorder/{workorderIds}")
public AjaxResult downWorkorder(@PathVariable String[] workorderIds) { public AjaxResult downWorkorder(@PathVariable String[] workorderIds) {

4
op-modules/op-plan/src/main/java/com/op/plan/controller/ProWetMaterialPlanController.java
Unescape Escape View File

@ -48,6 +48,8 @@ public class ProWetMaterialPlanController extends BaseController {
* @return * @return
*/ */
@PutMapping("/updatePlanDetail") @PutMapping("/updatePlanDetail")
@RequiresPermissions("mes:plan:edit")
@Log(title = "湿料计划修改", businessType = BusinessType.UPDATE)
public AjaxResult updateWetMaterialPlanDetail(@RequestBody List<ProWetMaterialPlanDetail> detailList) { public AjaxResult updateWetMaterialPlanDetail(@RequestBody List<ProWetMaterialPlanDetail> detailList) {
return proWetMaterialPlanService.updateWetMaterialPlanDetail(detailList); return proWetMaterialPlanService.updateWetMaterialPlanDetail(detailList);
} }
@ -70,6 +72,8 @@ public class ProWetMaterialPlanController extends BaseController {
* @return * @return
*/ */
@PostMapping("/addWetPlan") @PostMapping("/addWetPlan")
@RequiresPermissions("mes:plan:add")
@Log(title = "湿料计划新增", businessType = BusinessType.INSERT)
public AjaxResult addWetPlan(@RequestBody List<ProOrderWorkorder> proOrderWorkorderList) { public AjaxResult addWetPlan(@RequestBody List<ProOrderWorkorder> proOrderWorkorderList) {
return proWetMaterialPlanService.addWetPlan(proOrderWorkorderList); return proWetMaterialPlanService.addWetPlan(proOrderWorkorderList);
} }

Write Preview
Loading…
Cancel
Save