open_platform/ss-common-purchase
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

01/13

Browse Source
This commit is contained in:
wangpengfei
2025-01-13 08:48:21 +08:00
parent 88213cb24e
commit 7824f5e195
2 changed files with 82 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java
View File

@@ -61,7 +61,8 @@ public class PurchaseBillRest {
String sid = purchaseBillService.saveOrUpdateDto(dto);
return rb.success().setData(sid);
}
@ApiOperation("新增采购单(对外)")
@ApiOperation("新增采购单")
@PostMapping("/savePurchase")
public ResultBean<String> savePurchase(@RequestBody PurchaseBillDto dto){
ResultBean rb = ResultBean.fireFail();

82
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
View File

@@ -308,11 +308,86 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
}
return dtoSid;
}
public String save(PurchaseBillDto dto) {
String dtoSid = dto.getSid();
PurchaseBillAmountDto purchaseBillAmount=new PurchaseBillAmountDto();
if(dto.getPurchaseBillAmount()!=null){
purchaseBillAmount = dto.getPurchaseBillAmount();
}
PurchaseBillExtendDto purchaseBillExtend = new PurchaseBillExtendDto();
if(dto.getPurchaseBillExtend()!=null){
purchaseBillExtend=dto.getPurchaseBillExtend();
}
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
if (StringUtils.isBlank(dtoSid)) {
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "CGD" + dto.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
dto.setBillNo(billNo);
String sid = this.insertByDto(dto);
//保存采购单费用/预付款
purchaseBillAmount.setBillSid(sid);
purchaseBillAmountService.insertByDto(purchaseBillAmount);
//保存采购单扩展
purchaseBillExtend.setBillSid(sid);
purchaseBillExtend.setDeliveryStateKey("1");
purchaseBillExtend.setDeliveryStateValue("未发货");
purchaseBillExtend.setReceiveStateKey("1");
purchaseBillExtend.setReceiveStateValue("待提交");
purchaseBillExtendService.insertByDto(purchaseBillExtend);
//保存商品信息
for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
purchaseBillDetailDto.setBillSid(sid);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(sid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchDto.setBatchNumber(purchaseBillDetailDto.getBatchNumber());
purchaseBillBatchDto.setExpireDate(purchaseBillDetailDto.getExpireDate());
purchaseBillBatchDto.setMadeDate(purchaseBillDetailDto.getMadeDate());
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
purchaseAppendixDto.setLinkSid(sid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(purchaseAppendixUrl.getUrl());
purchaseAppendixService.insertByDto(purchaseAppendixDto);
}
//保存操作日志
PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
purchaseFlowNodeDto.setBillSid(sid);
purchaseFlowNodeDto.setCreateByName(dto.getCreateByName());
purchaseFlowNodeDto.setNodeCode("01");
purchaseFlowNodeDto.setNodeName("新增");
purchaseFlowNodeDto.setResult("成功");
purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto);
return sid;
}
return dtoSid;
}
public String savePurcahse(PurchaseBillDto dto) {
String dtoSid = dto.getSid();
PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount();
PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend();
PurchaseBillAmountDto purchaseBillAmount=new PurchaseBillAmountDto();
if(dto.getPurchaseBillAmount()!=null){
purchaseBillAmount = dto.getPurchaseBillAmount();
}
PurchaseBillExtendDto purchaseBillExtend = new PurchaseBillExtendDto();
if(dto.getPurchaseBillExtend()!=null){
purchaseBillExtend=dto.getPurchaseBillExtend();
}
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
//生成单据编号
@@ -451,6 +526,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
public void examine(String sid, String state, String remarks) {
baseMapper.updateState(sid, state);
PurchaseBill purchaseBill = fetchBySid(sid);
if(purchaseBill.getSourceBillSid()!=null){
}
//保存操作日志
PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
purchaseFlowNodeDto.setBillSid(sid);