|
@@ -1,5 +1,7 @@
|
|
|
package cn.ezhizao.project.business.auxiliaryDaywork.controller;
|
|
|
|
|
|
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
|
|
|
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
|
|
|
import cn.ezhizao.framework.web.controller.BaseController;
|
|
|
import cn.ezhizao.framework.web.domain.AjaxResult;
|
|
|
import cn.ezhizao.framework.web.page.TableDataInfo;
|
|
@@ -86,6 +88,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
|
|
|
@PostMapping("/list")
|
|
|
+ @Log(title = "辅助工序报工列表查询", businessType = BusinessType.UPDATE)
|
|
|
public TableDataInfo list(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) throws NoSuchFieldException, IllegalAccessException {
|
|
|
|
|
|
if (bizDayworkAuxiliaryItem.getStartTime() != null) {
|
|
@@ -143,6 +146,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getInfoByCarrierCode")
|
|
|
+ @Log(title = "辅助工序扫码查询", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getInfoByCarrierCode(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
|
|
|
BizCarrier bizCarrier = bizCarrierService.query().eq("code", bizDayworkAuxiliaryItem.getCarrierCode()).one();
|
|
|
if (bizCarrier == null) {
|
|
@@ -191,6 +195,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
|
|
|
|
@PostMapping("/save")
|
|
|
@Transactional
|
|
|
+ @Log(title = "辅助工序报工保存", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult save (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
|
|
|
bizDayworkAuxiliaryItem.setDayworkId(bizDayworkAuxiliaryItem.getDaywork().getId());
|
|
|
bizDayworkAuxiliaryItem.setStartTime(new Date());
|
|
@@ -279,6 +284,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
|
|
|
|
@PostMapping("/finished")
|
|
|
@Transactional
|
|
|
+ @Log(title = "辅助工序报工结束", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult finishedV1(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
|
|
|
// 添加报工废品
|
|
|
bizDayworkAuxiliaryItem.setStatus("3");
|
|
@@ -407,6 +413,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/pause")
|
|
|
+ @Log(title = "辅助工序报工暂存", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult pauseV1 (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
|
|
|
bizDayworkAuxiliaryItem.setStatus("1");
|
|
|
bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
|