Browse Source

1.修改预约列表中对订单进行客户修改操作无法操作的问题

2.修改三方物料无法搜索结算平类的问题
dist.1.3.0
pref_mail@163.com 6 months ago
parent
commit
8bf533ced6
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  2. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@ -350,7 +350,7 @@ public class DistributionStockArticleController extends BladeController {
public R updateClient(@Valid @RequestBody DistributionStockArticleEntity distributionStockArticle) { public R updateClient(@Valid @RequestBody DistributionStockArticleEntity distributionStockArticle) {
Long id = distributionStockArticle.getId(); Long id = distributionStockArticle.getId();
DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id); DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id);
if (!OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(oldStockArticle)) { if (!OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(oldStockArticle.getReservationStatus())) {
return R.fail(oldStockArticle.getOrderCode() + "存在预约信息"); return R.fail(oldStockArticle.getOrderCode() + "存在预约信息");
} }
DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity(); DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity();

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -378,9 +378,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
private String getDeliveryTypeName(String type) { private String getDeliveryTypeName(String type) {
switch (type) { switch (type) {
case "1": case "1":
return DistributionTypeConstant.shipie.getName();
case "2":
return DistributionTypeConstant.shangpei.getName(); return DistributionTypeConstant.shangpei.getName();
case "2":
return DistributionTypeConstant.shipie.getName();
case "3":
return DistributionTypeConstant.ziti.getName();
default: default:
return ""; return "";
} }

Loading…
Cancel
Save