|
|
@ -166,18 +166,23 @@ public class ThrProductsController {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("/udiwms/udiinfo/erp/products/saveProduct")
|
|
|
|
@PostMapping("/udiwms/udiinfo/erp/products/saveProduct")
|
|
|
|
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity) {
|
|
|
|
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity,FilterThrProductsRequest filterThrProductsRequest) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (null == thrProductsEntity)
|
|
|
|
if (null == thrProductsEntity)
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(thrProductsEntity,filterThrProductsRequest);
|
|
|
|
thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId()));
|
|
|
|
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrProductsRequest);
|
|
|
|
thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId()));
|
|
|
|
if(thrProductsEntities.size()==0){
|
|
|
|
thrProductsEntity.setUpdateTime(new Date());
|
|
|
|
thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId()));
|
|
|
|
thrProductsEntity.setCreateTime(new Date());
|
|
|
|
thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId()));
|
|
|
|
thrProductsService.insertThrProducts(thrProductsEntity);
|
|
|
|
thrProductsEntity.setUpdateTime(new Date());
|
|
|
|
|
|
|
|
thrProductsEntity.setCreateTime(new Date());
|
|
|
|
|
|
|
|
thrProductsService.insertThrProducts(thrProductsEntity);
|
|
|
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultVOUtils.error(999,"数据已存在!");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //新增主系统产品信息直接加到耗材字典里
|
|
|
|
// //新增主系统产品信息直接加到耗材字典里
|
|
|
@ -186,7 +191,7 @@ public class ThrProductsController {
|
|
|
|
// if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) {
|
|
|
|
// if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) {
|
|
|
|
// udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
|
|
|
|
// udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|