|
@@ -140,7 +140,7 @@ public class BizDayworkController extends BaseController {
|
|
|
*/
|
|
|
@Transactional
|
|
|
@GetMapping("/list")
|
|
|
- @Log(title = "报工", businessType = BusinessType.SELECT)
|
|
|
+ @Log(title = "获取报工列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult list(BizDaywork bizDaywork) {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
Long userId = user.getUserId();
|
|
@@ -820,7 +820,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 导出报工列表
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:daywork:export')")
|
|
|
- @Log(title = "报工", businessType = BusinessType.EXPORT)
|
|
|
+ @Log(title = "导出报工信息", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<BizDaywork> list = bizDayworkService.getList(bizDaywork);
|
|
@@ -857,7 +857,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 新增报工
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:daywork:add')")
|
|
|
- @Log(title = "报工", businessType = BusinessType.INSERT)
|
|
|
+ @Log(title = "新增报工", businessType = BusinessType.INSERT)
|
|
|
@Transactional
|
|
|
@PostMapping
|
|
|
public AjaxResult add(@RequestBody BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
|
|
@@ -1066,7 +1066,7 @@ public class BizDayworkController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/check")
|
|
|
- @Log(title = "报工", businessType = BusinessType.SELECT)
|
|
|
+ @Log(title = "检查报工载具", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult check(@RequestBody BizDaywork bizDaywork) {
|
|
|
|
|
|
List<BizDayworkCarrier> list = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
|
|
@@ -1082,7 +1082,7 @@ public class BizDayworkController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:daywork:query')")
|
|
|
@Transactional
|
|
|
- @Log(title = "报工", businessType = BusinessType.SELECT)
|
|
|
+ @Log(title = "扫码开始报工查询报工信息", businessType = BusinessType.SELECT)
|
|
|
// @GetMapping(value = "/showDaywork")
|
|
|
public AjaxResult getDayworkByCarrier(BizDayworkItem bizDayworkItem) {
|
|
|
// 判断是否被领取
|
|
@@ -1133,7 +1133,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping(value = "/showDaywork")
|
|
|
- @Log(title = "报工", businessType = BusinessType.SELECT)
|
|
|
+ @Log(title = "扫码获取报工详细信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDayworkByCarrierId(BizDayworkItem bizDayworkItem) {
|
|
|
try {
|
|
|
// 根据箱号,获取箱子
|
|
@@ -1234,7 +1234,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 非首序扫码添加批次
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:daywork:add')")
|
|
|
- @Log(title = "报工", businessType = BusinessType.INSERT)
|
|
|
+ @Log(title = "非首序扫码添加批次报工", businessType = BusinessType.INSERT)
|
|
|
@Transactional
|
|
|
// @PostMapping("/showDayworkSave")
|
|
|
public AjaxResult showDaywork(@RequestBody List<BizDaywork> bizDaywork) {
|