|
@@ -33,7 +33,7 @@ public class GoodsController {
|
|
|
private GoodsService goodsService;
|
|
private GoodsService goodsService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 商品录入
|
|
|
|
|
|
|
+ * 资产录入
|
|
|
* 参数:
|
|
* 参数:
|
|
|
* name :名称,tagId:标签id,modelNumber:模具型号,company:公司
|
|
* name :名称,tagId:标签id,modelNumber:模具型号,company:公司
|
|
|
* ,address:地址,factory:生产厂家,file:产品图片文件,serviceLife:服务期限(天),
|
|
* ,address:地址,factory:生产厂家,file:产品图片文件,serviceLife:服务期限(天),
|
|
@@ -41,7 +41,7 @@ public class GoodsController {
|
|
|
* 注:产品编号=部门编号前缀+产品编号前缀+随机数
|
|
* 注:产品编号=部门编号前缀+产品编号前缀+随机数
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @ApiOperation(value = "商品录入", notes = "商品录入方法")
|
|
|
|
|
|
|
+ @ApiOperation(value = "资产录入", notes = "资产录入方法")
|
|
|
@RequestMapping("/add")
|
|
@RequestMapping("/add")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public HttpRespMsg add(GoodsVO goodsVO, @RequestParam(required = false) MultipartFile file) {
|
|
public HttpRespMsg add(GoodsVO goodsVO, @RequestParam(required = false) MultipartFile file) {
|
|
@@ -50,14 +50,14 @@ public class GoodsController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 商品基本信息修改
|
|
|
|
|
- * 参数:id:商品信息id
|
|
|
|
|
|
|
+ * 资产基本信息修改
|
|
|
|
|
+ * 参数:id:资产信息id
|
|
|
* name :名称,tagId:标签id,modelNumber:模具型号,company:公司
|
|
* name :名称,tagId:标签id,modelNumber:模具型号,company:公司
|
|
|
* ,address:地址,factory:生产厂家,file:产品图片文件,serviceLife:服务期限(天),
|
|
* ,address:地址,factory:生产厂家,file:产品图片文件,serviceLife:服务期限(天),
|
|
|
* nextIndate:下次维护日期
|
|
* nextIndate:下次维护日期
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @ApiOperation(value = "商品基本信息修改", notes = "商品基本信息修改方法")
|
|
|
|
|
|
|
+ @ApiOperation(value = "资产基本信息修改", notes = "资产基本信息修改方法")
|
|
|
@RequestMapping("/update")
|
|
@RequestMapping("/update")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public HttpRespMsg updateInfo(Goods goods, @RequestParam(required = false) MultipartFile file) {
|
|
public HttpRespMsg updateInfo(Goods goods, @RequestParam(required = false) MultipartFile file) {
|
|
@@ -67,12 +67,12 @@ public class GoodsController {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 商品列表
|
|
|
|
|
|
|
+ * 资产列表
|
|
|
* 参数:
|
|
* 参数:
|
|
|
* name :名称,tagId:标签id,keyName:关键字,pageNum:当前页,pageSize:每页多少条
|
|
* name :名称,tagId:标签id,keyName:关键字,pageNum:当前页,pageSize:每页多少条
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @ApiOperation(value = "商品列表", notes = "商品列表方法")
|
|
|
|
|
|
|
+ @ApiOperation(value = "资产列表", notes = "资产列表方法")
|
|
|
@RequestMapping("/list")
|
|
@RequestMapping("/list")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public HttpRespMsg list(PageUtil page,@RequestParam(required = false)String keyName,Integer tagId) {
|
|
public HttpRespMsg list(PageUtil page,@RequestParam(required = false)String keyName,Integer tagId) {
|
|
@@ -81,11 +81,11 @@ public class GoodsController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 商品的删除
|
|
|
|
|
- * 参数:id:商品基本信息id
|
|
|
|
|
|
|
+ * 资产的删除
|
|
|
|
|
+ * 参数:id:资产基本信息id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @ApiOperation(value = "商品的删除", notes = "商品的删除方法")
|
|
|
|
|
|
|
+ @ApiOperation(value = "资产的删除", notes = "资产的删除方法")
|
|
|
@RequestMapping("/del")
|
|
@RequestMapping("/del")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public HttpRespMsg del(Goods goods) {
|
|
public HttpRespMsg del(Goods goods) {
|