CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:b6e61961f7ef54cf28fc596bdd6983b173203e01
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:7970efd5d0eb84999cbdc748e7aa95fecd05b868
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "b6e61961f7ef54cf28fc596bdd6983b173203e01" and "7970efd5d0eb84999cbdc748e7aa95fecd05b868" have entirely different histories.
b6e61961f7 ... 7970efd5d0

7 changed files with 11 additions and 32 deletions
Show Stats Expand all files Collapse all files

3
ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java
View File

@ -9,7 +9,6 @@ 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;
@ -90,7 +89,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
//保存角色
BaseSupportUtils.setCommonField(entity);
insert(entity);
//保存角色菜单关系
@ -106,7 +104,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
//更新角色
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
//更新角色菜单关系

3
ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java
View File

@ -9,7 +9,6 @@ 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;
@ -99,7 +98,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//保存用户
entity.setSuperAdmin(SuperAdminEnum.NO.value());
BaseSupportUtils.setCommonField(entity);
insert(entity);
//保存角色用户关系
@ -120,7 +118,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
}
//更新用户
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
//更新角色用户关系

2
ym-admin/src/main/resources/mapper/SysDeptDao.xml
View File

@ -23,7 +23,7 @@
</select>
<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
select t1.id, t1.pid from sys_dept t1 where t1.valid = 1
select t1.id, t1.pid from sys_dept t1 AND t1.valid = 1
</select>
<select id="getSubDeptIdList" resultType="long">

2
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@ -205,7 +205,7 @@ public class KukaJoinThread implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
//
// kukaStep1.scheduleAtFixedRate(new Runnable() {
// @Override
// public void run() {

16
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java
View File

@ -1,6 +1,5 @@
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;
@ -17,7 +16,6 @@ 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;
@ -46,8 +44,6 @@ import java.util.Map;
public class WoPackagingBoxController {
@Autowired
private WoPackagingBoxServiceBiz woPackagingBoxService;
@Autowired
private WoPackagingBoxMapper woPackagingBoxMapper;
@GetMapping("page")
@ApiOperation("分页")
@ -166,17 +162,9 @@ public class WoPackagingBoxController {
@PostMapping("insertSubstrateManual")
@ApiOperation("手动新增包装箱")
@LogOperation("手动新增包装箱")
public Result<IdVo> insertSubstrateManual(@RequestBody WoPackagingBoxDTO dto){
public IdVo insertSubstrateManual(@RequestBody WoPackagingBoxDTO 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));
}
return woPackagingBoxService.insertSubstrateManual(dto);
}

15
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
View File

@ -106,20 +106,15 @@ 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.setBoxNo(woPackagingBox.getBoxNo());
woPackagingPrintHistory.setPrintStatus(1);
woPackagingPrintHistory.setPrintCount(1);
LocalDateTime printTime = LocalDateTime.now();
woPackagingPrintHistory.setPrintTime(printTime);
BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
woPackagingPrintHistory.setId(null);
woPackagingPrintHistory.setPrintTime(LocalDateTime.now());
BaseSupportUtils.setCommonField(woPackagingPrintHistory);
insert(woPackagingPrintHistory);
//更新包装箱表中打印状态和时间
woPackagingBox.setPrintTime(printTime);
woPackagingBox.setPrintTime(woPackagingPrintHistory.getPrintTime());
if(woPackagingBox.getPrintStatus()==0){
woPackagingBox.setPrintCount(1);
woPackagingBox.setPrintStatus(1);

2
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File

@ -15,6 +15,8 @@ public class PowerReportVo {
private Float totalLevelPower; //档位功率汇总
private Float totalCompensatePower; //补偿功率汇总
private Float diversePower; //差异功率汇总
private List<PowerReportDTO> powerReports;
}