github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

委外加工单修改

pull/451/head
starrysky 2019-08-17 16:59:54 +08:00
parent 5025e613df
commit f0d5fd27e9
4 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/UpdateOutSourceProcessSheetRequest.java Normal file
View File

@ -0,0 +1,34 @@
package me.zhengjie.modules.wms.outSourceProductSheet.request;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author 黄星星
* @date 2019-08-17
*/
@Data
public class UpdateOutSourceProcessSheetRequest implements Serializable {
// 委外加工公司名称
private String outSourceCompanyName;
// 委外加工公司编号
private String outSourceCompanyCode;
// 委外负责人id
private Integer outSourceAdminId;
// 委外负责人姓名
private String outSourceAdminName;
// 联系方式
private String contactWay;
// 委外加工单单据编号
private String outSourceProcessSheetCode;
// 委外加工产品
private List<OutSourceProcessSheetProductRequest> outSourceProcessSheetProductList;
}

5
eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/rest/OutSourceProcessSheetController.java
View File

@ -3,6 +3,7 @@ package me.zhengjie.modules.wms.outSourceProductSheet.rest;
import me.zhengjie.aop.log.Log;
import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheet;
import me.zhengjie.modules.wms.outSourceProductSheet.request.CreateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.request.UpdateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.service.OutSourceProcessSheetService;
import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
@ -46,8 +47,8 @@ public class OutSourceProcessSheetController {
@ApiOperation(value = "修改委外加工单")
@PutMapping(value = "/outSourceProcessSheet")
@PreAuthorize("hasAnyRole('ADMIN','SOUTSOURCEPROCESSSHEET_ALL','SOUTSOURCEPROCESSSHEET_EDIT')")
public ResponseEntity update(@Validated @RequestBody OutSourceProcessSheet resources){
outSourceProcessSheetService.update(resources);
public ResponseEntity update(@RequestBody UpdateOutSourceProcessSheetRequest updateOutSourceProcessSheetRequest){
outSourceProcessSheetService.update(updateOutSourceProcessSheetRequest);
return new ResponseEntity(HttpStatus.NO_CONTENT);
}

5
eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/OutSourceProcessSheetService.java
View File

@ -2,6 +2,7 @@ package me.zhengjie.modules.wms.outSourceProductSheet.service;
import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheet;
import me.zhengjie.modules.wms.outSourceProductSheet.request.CreateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.request.UpdateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetDTO;
import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetQueryCriteria;
//import org.springframework.cache.annotation.CacheConfig;
@ -51,10 +52,10 @@ public interface OutSourceProcessSheetService {
/**
* update
* @param resources
* @param updateOutSourceProcessSheetRequest
*/
//@CacheEvict(allEntries = true)
void update(OutSourceProcessSheet resources);
void update(UpdateOutSourceProcessSheetRequest updateOutSourceProcessSheetRequest);
/**
* delete

9
eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java
View File

@ -6,6 +6,7 @@ import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessShee
import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetProductRepository;
import me.zhengjie.modules.wms.outSourceProductSheet.request.CreateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.request.OutSourceProcessSheetProductRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.request.UpdateOutSourceProcessSheetRequest;
import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetProductDTO;
import me.zhengjie.utils.ValidationUtil;
import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetRepository;
@ -114,12 +115,8 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe
@Override
@Transactional(rollbackFor = Exception.class)
public void update(OutSourceProcessSheet resources) {
Optional<OutSourceProcessSheet> optionalSOutSourceProcessSheet = outSourceProcessSheetRepository.findById(resources.getId());
ValidationUtil.isNull( optionalSOutSourceProcessSheet,"SOutSourceProcessSheet","id",resources.getId());
OutSourceProcessSheet outSourceProcessSheet = optionalSOutSourceProcessSheet.get();
outSourceProcessSheet.copy(resources);
outSourceProcessSheetRepository.save(outSourceProcessSheet);
public void update(UpdateOutSourceProcessSheetRequest updateOutSourceProcessSheetRequest) {
}
@Override