Browse Source

配置

master
wangpengfei 6 months ago
parent
commit
3c29013a42
  1. 8
      src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java
  2. 86
      src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java
  3. 6
      src/main/resources/application-pro.yml

8
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){

86
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java

@ -287,7 +287,93 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
return sid;
}
public String saveSales(SmsSalesBillDto dto) {
String sid = "";
SmsSalesBill smsSalesBill = new SmsSalesBill();
sid = smsSalesBill.getSid();
BeanUtil.copyProperties(dto, smsSalesBill, "id", "sid");
String applyCode = getApplyCode();
smsSalesBill.setBillNo(applyCode);
smsSalesBill.setState(0);
baseMapper.insert(smsSalesBill);
OmsFlowNode omsFlowNode = new OmsFlowNode();
omsFlowNode.setBillSid(sid);
omsFlowNode.setCreateBySid(dto.getCreateBySid());
omsFlowNode.setCreateByName(dto.getCreateByName());
omsFlowNode.setRemarks("新增销售订单");
omsFlowNodeService.insert(omsFlowNode);
if (StringUtils.isNotBlank(sid)) {
SmsSalesBillLogistics logistics = new SmsSalesBillLogistics();
BeanUtil.copyProperties(dto, logistics, "id", "sid", "remarks");
logistics.setBillSid(sid);
smsSalesBillLogisticsService.insert(logistics);
SmsSalesBillshipper billshipper = new SmsSalesBillshipper();
BeanUtil.copyProperties(dto, billshipper, "id", "sid", "remarks");
billshipper.setBillSid(sid);
smsSalesBillshipperService.insert(billshipper);
SmsSalesBillInvoice invoice = new SmsSalesBillInvoice();
BeanUtil.copyProperties(dto, invoice, "id", "sid", "remarks");
invoice.setBillSid(sid);
smsSalesBillInvoiceService.insert(invoice);
List<AccountVo> 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<SmsSalesBillDetailDetailsVo> 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<String> 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<FileQueryUrl> 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");

6
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/

Loading…
Cancel
Save