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

mark

Browse Source
This commit is contained in:
闫阳
2022-08-01 13:44:01 +08:00
parent bac1ec5b70
commit e9e0c47536
26 changed files with 436 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-13
*/
@RestController
@RequestMapping("/code/factory")
@RequestMapping("/basic/factory")
@Api(tags="工厂 表")
public class FactoryController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/machine")
@RequestMapping("/basic/machine")
@Api(tags="机台表")
public class MachineController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-13
*/
@RestController
@RequestMapping("/code/measureTool")
@RequestMapping("/basic/measureTool")
@Api(tags="量具表")
public class MeasureToolController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-13
*/
@RestController
@RequestMapping("/code/platform")
@RequestMapping("/basic/platform")
@Api(tags="站点表")
public class PlatformController {
@Autowired

14
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
View File

@@ -13,6 +13,7 @@ import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.excel.ProductExcel;
import com.cnbm.basic.service.IProductService;
import com.google.gson.internal.$Gson$Preconditions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,7 +35,7 @@ import java.util.Map;
* @since 2022-07-11
*/
@RestController
@RequestMapping("/code/product")
@RequestMapping("/basic/product")
@Api(tags="产品 表")
public class ProductController {
@Autowired
@@ -68,13 +69,13 @@ public class ProductController {
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:product:save')")
public Result save(@RequestBody ProductDTO dto){
public Result<ProductDTO> save(@RequestBody ProductDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
productService.save(dto);
return new Result();
return new Result<ProductDTO>().ok(dto);
}
@PutMapping
@@ -113,13 +114,12 @@ public class ProductController {
ExcelUtils.exportExcelToTarget(response, null, list, ProductExcel.class);
}
@GetMapping("status")
@GetMapping("status/{id}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
productService.changeStatus(id);
return new Result();
boolean b = productService.changeStatus(id);
return new Result().ok(b);
}
}

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-27
*/
@RestController
@RequestMapping("/code/productFactoryRelation")
@RequestMapping("/basic/productFactoryRelation")
@Api(tags="产品-工厂 关系表")
public class ProductFactoryRelationController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/productFeatures")
@RequestMapping("/basic/productFeatures")
@Api(tags="产品特性 表")
public class ProductFeaturesController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/productFeaturesHis")
@RequestMapping("/basic/productFeaturesHis")
@Api(tags="产品特性 历史表")
public class ProductFeaturesHisController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-06-30
*/
@RestController
@RequestMapping("/code/productType")
@RequestMapping("/basic/productType")
@Api(tags="产品类型 表")
public class ProductTypeController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java
View File

@@ -35,7 +35,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/productWorkingprocedureRelation")
@RequestMapping("/basic/productWorkingprocedureRelation")
@Api(tags="产品-工序 关系表")
public class ProductWorkingprocedureRelationController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-13
*/
@RestController
@RequestMapping("/code/shift")
@RequestMapping("/basic/shift")
@Api(tags="班次 表")
public class ShiftController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-13
*/
@RestController
@RequestMapping("/code/team")
@RequestMapping("/basic/team")
@Api(tags="班组 表")
public class TeamController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-06-30
*/
@RestController
@RequestMapping("/code/unit")
@RequestMapping("/basic/unit")
@Api(tags="单位 表")
public class UnitController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/workingProcedure")
@RequestMapping("/basic/workingProcedure")
@Api(tags="工序 表")
public class WorkingProcedureController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java
View File

@@ -34,7 +34,7 @@ import java.util.Map;
* @since 2022-07-15
*/
@RestController
@RequestMapping("/code/workingProcedureType")
@RequestMapping("/basic/workingProcedureType")
@Api(tags="工序类型表 表")
public class WorkingProcedureTypeController {
@Autowired

2
ym-baisc/src/main/java/com/cnbm/basic/service/IProductService.java
View File

@@ -22,6 +22,6 @@ public interface IProductService extends CrudService<Product, ProductDTO> {
void update(ProductDTO dto);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
View File

@@ -90,12 +90,12 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
Product entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
}