CaiXiang/SPC
1
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC

浏览代码 
 Conflicts:
	ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java
	ym-influx/src/main/java/com/cnbm/influx/Main.java
这个提交包含在：
caixiang 2022-07-21 09:50:48 +08:00
当前提交 1477d05a69
共有 11 个文件被更改，包括 47 次插入 和 87 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

15
ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java
查看文件

@ -64,14 +64,6 @@ public class FactoryController {
return new Result<FactoryDTO>().ok(data);
}
@GetMapping("{id}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
factoryService.changeStatus(id);
return new Result();
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@ -121,6 +113,13 @@ public class FactoryController {
ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class);
}
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
factoryService.changeStatus(id);
return new Result();
}
}

9
ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java
查看文件

@ -113,4 +113,13 @@ public class MachineController {
ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
}
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
machineService.changeStatus(id);
return new Result();
}
}

2
ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java
查看文件

@ -113,7 +113,7 @@ public class MeasureToolController {
ExcelUtils.exportExcelToTarget(response, null, list, MeasureToolExcel.class);
}
@GetMapping("{id}")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

9
ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java
查看文件

@ -113,4 +113,13 @@ public class PlatformController {
ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class);
}
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
platformService.changeStatus(id);
return new Result();
}
}

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java
查看文件

@ -114,7 +114,7 @@ public class ProductTypeController {
ExcelUtils.exportExcelToTarget(response, null, list, ProductTypeExcel.class);
}
@GetMapping("{id}")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

2
ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java
查看文件

@ -113,7 +113,7 @@ public class UnitController {
ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class);
}
@GetMapping("{id}")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

9
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java
查看文件

@ -113,4 +113,13 @@ public class WorkingProcedureController {
ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureExcel.class);
}
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
workingProcedureService.changeStatus(id);
return new Result();
}
}

9
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java
查看文件

@ -113,4 +113,13 @@ public class WorkingProcedureTypeController {
ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class);
}
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
workingProcedureTypeService.changeStatus(id);
return new Result();
}
}

75
ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml
查看文件

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cnbm.basic.mapper.ProductTypeMapper">
<sql id="Base_Column_List">
id,
`name`,
code,
descs,
`status`,
remark,
`valid`,
creator_id,
creator_name,
create_time,
updater_id,
updater_name,
update_time,
version
</sql>
<resultMap id="BaseResultMap" type="com.cnbm.basic.entity.ProductType">
<result column="id" property="id"/>
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="descs" property="descs"/>
<result column="status" property="status"/>
<result column="remark" property="remark"/>
<result column="valid" property="valid"/>
<result column="creator_id" property="creatorId"/>
<result column="creator_name" property="creatorName"/>
<result column="create_time" property="createTime"/>
<result column="updater_id" property="updaterId"/>
<result column="updater_name" property="updaterName"/>
<result column="update_time" property="updateTime"/>
<result column="version" property="version"/>
</resultMap>
<!--auto generated by MybatisCodeHelper on 2022-07-05-->
<insert id="insertList">
INSERT INTO product_type(
id,
name,
code,
descs,
status,
remark,
valid,
creator_id,
creator_name,
create_time,
updater_id,
updater_name,
update_time,
version
)VALUES
<foreach collection="list" item="element" index="index" separator=",">
(
#{element.id},
#{element.name},
#{element.code},
#{element.descs},
#{element.status},
#{element.remark},
#{element.valid},
#{element.creatorId},
#{element.creatorName},
#{element.createTime},
#{element.updaterId},
#{element.updaterName},
#{element.updateTime},
#{element.version}
)
</foreach>
</insert>
</mapper>

2
ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java
查看文件

@ -65,7 +65,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
workingProcedureDTO.setWorkingProcedureTypeName(workingProcedureTypeName);
if(StringUtils.isNotBlank(workingProcedureDTO.getMachineId())){
String[] machineIdList = workingProcedureDTO.getMachineId().split(",");
List<String> machineList = new ArrayList<>();
ArrayList<String> machineList = new ArrayList<>();
for(String machineId:machineIdList){
//QueryWrapper<Machine> machineQueryWrapper = new QueryWrapper<>();
//machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId);

0
ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml → ym-baisc/src/main/resources/UnitMapper.xml
查看文件