diff --git a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java index 01d53d5..6284503 100644 --- a/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java +++ b/src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java @@ -139,7 +139,13 @@ public class SmsSalesBillRest { String sid = smsSalesBillService.saveOrUpdateDto(dto); return rb.success().setData(sid); } - + @ApiOperation("新增销售单(对外)") + @PostMapping("/saveSales") + public ResultBean saveSales(@RequestBody SmsSalesBillDto dto){ + ResultBean rb = ResultBean.fireFail(); + String sid = smsSalesBillService.saveSales(dto); + return rb.success().setData(sid); + } @ApiOperation("提交") @PostMapping("/submit") public ResultBean submit(@RequestBody SmsSalesBillDto dto){ diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java index 95ab0b1..6c0be2e 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java @@ -287,7 +287,93 @@ public class SmsSalesBillService extends MybatisBaseService accounts = dto.getAccounts(); + if (!accounts.isEmpty()) { + for (AccountVo accountVo : accounts) { + SmsSalesBillAccount account = new SmsSalesBillAccount(); + BeanUtil.copyProperties(accountVo, account, "id", "sid", "remarks"); + account.setBillSid(sid); + smsSalesBillAccountService.insert(account); + } + } else { + if (StringUtils.isNotBlank(dto.getBankAccount())) { + SmsSalesBillAccount account = new SmsSalesBillAccount(); + BeanUtil.copyProperties(dto, account, "id", "sid", "remarks"); + account.setBillSid(sid); + smsSalesBillAccountService.insert(account); + } + } + SmsSalesBillAmount amount = new SmsSalesBillAmount(); + BeanUtil.copyProperties(dto, amount, "id", "sid", "remarks"); + amount.setBillSid(sid); + smsSalesBillAmountService.insert(amount); + List goodsList = dto.getGoodsList(); + if (!goodsList.isEmpty()) { + for (SmsSalesBillDetailDetailsVo g : goodsList) { + SmsSalesBillDetail detail = new SmsSalesBillDetail(); + BeanUtil.copyProperties(g, detail, "id", "sid"); + detail.setBillSid(sid); + if (!g.getPic().isEmpty()) { + StringBuffer sb = new StringBuffer(); + List pic = g.getPic(); + for (String s : pic) { +// String filePath = s.replace(fileUploadComponent.getUrlPrefix(), ""); + String filePath = s; + sb.append(filePath).append(","); + } + if (sb.length() > 0) { + sb.delete(sb.length() - 1, sb.length()); + detail.setGoodsImgUrl(sb.toString()); + } + } + + smsSalesBillDetailService.insert(detail); + } + } + List files = dto.getFiles(); + if (!files.isEmpty()) { + //保存附件信息 + for (FileQueryUrl appendixUrl : files) { + SmsAppendixDto appendixDto = new SmsAppendixDto(); + String filePath = appendixUrl.getUrl(); + appendixDto.setLinkSid(sid); + appendixDto.setAttachType(SmsFileEnum.SMSSALESBILL.getAttachType()); + appendixDto.setFilePath(filePath); + smsAppendixService.insertByDto(appendixDto); + } + } + } + return sid; + } public void insertByDto(SmsSalesBillDto dto) { SmsSalesBill entity = new SmsSalesBill(); BeanUtil.copyProperties(dto, entity, "id", "sid"); diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index ce3b54d..de2ff0d 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/ss_sales?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root - password: 1LAiGz$t1*Iw + password: Yxt@67508182 cloud: nacos: discovery: @@ -22,8 +22,8 @@ spring: timeout: 0 # 连接超时时间(毫秒) image: upload: - path: D:/webapps/lipinka/yythmall-ui/upload/ + path: D:/webapps/share-store/ui/share-store/upload/ url: - prefix: https://supervise.yxtsoft.com/lpk/upload/ + prefix: https:/wms.yxtsoft.com/upload/ import: filePath: D:/yxt-supervise-gf/upload/