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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
God
2024-10-21 11:29:26 +08:00
parent 451e562780 c9abce971c
commit 77c4fc2486
2 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -72,6 +72,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
@Autowired @Autowired
private PurchaseFlowNodeService purchaseFlowNodeService; private PurchaseFlowNodeService purchaseFlowNodeService;
@Autowired
private FileUploadComponent fileUploadComponent;
public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) { public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PurchaseBillQuery query = pq.getParams(); PurchaseBillQuery query = pq.getParams();
@@ -306,6 +309,68 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
return dtoSid; return dtoSid;
} }
public String savePurcahse(PurchaseBillDto dto) {
String dtoSid = dto.getSid();
PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount();
PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend();
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
//生成单据编号
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 goodsImgUrl = purchaseBillDetailDto.getGoodsImgUrl();
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
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();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(sid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath);
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;
}
public void submit(String[] sids) { public void submit(String[] sids) {
for (String sid : sids) { for (String sid : sids) {
PurchaseBill purchaseBill = fetchBySid(sid); PurchaseBill purchaseBill = fetchBySid(sid);