包装箱名验证
This commit is contained in:
parent
7970efd5d0
commit
42f4f2e741
@ -9,6 +9,7 @@ import com.cnbm.admin.entity.SysRoleEntity;
|
||||
import com.cnbm.admin.entity.SysUserEntity;
|
||||
import com.cnbm.admin.enums.SuperAdminEnum;
|
||||
import com.cnbm.admin.service.*;
|
||||
import com.cnbm.admin.utils.BaseSupportUtils;
|
||||
import com.cnbm.common.constant.Constant;
|
||||
import com.cnbm.common.page.PageData;
|
||||
import com.cnbm.common.service.impl.BaseServiceImpl;
|
||||
@ -89,6 +90,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
|
||||
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
|
||||
|
||||
//保存角色
|
||||
BaseSupportUtils.setCommonField(entity);
|
||||
insert(entity);
|
||||
|
||||
//保存角色菜单关系
|
||||
@ -104,6 +106,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
|
||||
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
|
||||
|
||||
//更新角色
|
||||
BaseSupportUtils.setUpdateCommonField(entity);
|
||||
updateById(entity);
|
||||
|
||||
//更新角色菜单关系
|
||||
|
@ -9,6 +9,7 @@ import com.cnbm.admin.enums.SuperAdminEnum;
|
||||
import com.cnbm.admin.service.SysDeptService;
|
||||
import com.cnbm.admin.service.SysRoleUserService;
|
||||
import com.cnbm.admin.service.SysUserService;
|
||||
import com.cnbm.admin.utils.BaseSupportUtils;
|
||||
import com.cnbm.admin.utils.PasswordUtils;
|
||||
import com.cnbm.common.constant.Constant;
|
||||
import com.cnbm.common.page.PageData;
|
||||
@ -98,6 +99,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
|
||||
|
||||
//保存用户
|
||||
entity.setSuperAdmin(SuperAdminEnum.NO.value());
|
||||
BaseSupportUtils.setCommonField(entity);
|
||||
insert(entity);
|
||||
|
||||
//保存角色用户关系
|
||||
@ -118,6 +120,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
|
||||
}
|
||||
|
||||
//更新用户
|
||||
BaseSupportUtils.setUpdateCommonField(entity);
|
||||
updateById(entity);
|
||||
|
||||
//更新角色用户关系
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.cnbm.packing.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.cnbm.admin.annotation.LogOperation;
|
||||
import com.cnbm.common.constant.Constant;
|
||||
import com.cnbm.common.page.PageData;
|
||||
@ -16,6 +17,7 @@ import com.cnbm.packing.entity.WoPackagingBox;
|
||||
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
|
||||
import com.cnbm.packing.excel.WoPackagingBoxExcel;
|
||||
import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel;
|
||||
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
|
||||
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@ -44,6 +46,8 @@ import java.util.Map;
|
||||
public class WoPackagingBoxController {
|
||||
@Autowired
|
||||
private WoPackagingBoxServiceBiz woPackagingBoxService;
|
||||
@Autowired
|
||||
private WoPackagingBoxMapper woPackagingBoxMapper;
|
||||
|
||||
@GetMapping("page")
|
||||
@ApiOperation("分页")
|
||||
@ -162,9 +166,17 @@ public class WoPackagingBoxController {
|
||||
@PostMapping("insertSubstrateManual")
|
||||
@ApiOperation("手动新增包装箱")
|
||||
@LogOperation("手动新增包装箱")
|
||||
public IdVo insertSubstrateManual(@RequestBody WoPackagingBoxDTO dto){
|
||||
public Result<IdVo> insertSubstrateManual(@RequestBody WoPackagingBoxDTO dto){
|
||||
|
||||
return woPackagingBoxService.insertSubstrateManual(dto);
|
||||
//验证包装箱是否重名
|
||||
QueryWrapper<WoPackagingBox> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq(WoPackagingBox.BOX_NO, dto.getBoxNo());
|
||||
if(woPackagingBoxMapper.selectCount(wrapper)!= 0){
|
||||
return new Result().error(1,"BoxID已存在,请重新输入");
|
||||
}
|
||||
else {
|
||||
return new Result<IdVo>().ok(woPackagingBoxService.insertSubstrateManual(dto));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
@ -106,15 +106,20 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
|
||||
public void print(Long id) {
|
||||
|
||||
WoPackagingBoxDTO woPackagingBox = woPackagingBoxServiceBiz.get(id);
|
||||
|
||||
//新增包装箱打印记录
|
||||
WoPackagingPrintHistory woPackagingPrintHistory = new WoPackagingPrintHistory();
|
||||
BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
|
||||
woPackagingPrintHistory.setId(null);
|
||||
woPackagingPrintHistory.setPrintTime(LocalDateTime.now());
|
||||
// BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
|
||||
// woPackagingPrintHistory.setId(null);
|
||||
woPackagingPrintHistory.setBoxNo(woPackagingBox.getBoxNo());
|
||||
woPackagingPrintHistory.setPrintStatus(1);
|
||||
woPackagingPrintHistory.setPrintCount(1);
|
||||
LocalDateTime printTime = LocalDateTime.now();
|
||||
woPackagingPrintHistory.setPrintTime(printTime);
|
||||
BaseSupportUtils.setCommonField(woPackagingPrintHistory);
|
||||
insert(woPackagingPrintHistory);
|
||||
|
||||
//更新包装箱表中打印状态和时间
|
||||
woPackagingBox.setPrintTime(woPackagingPrintHistory.getPrintTime());
|
||||
woPackagingBox.setPrintTime(printTime);
|
||||
if(woPackagingBox.getPrintStatus()==0){
|
||||
woPackagingBox.setPrintCount(1);
|
||||
woPackagingBox.setPrintStatus(1);
|
||||
|
Loading…
Reference in New Issue
Block a user