朱园亮 / xingyun-erp · Commits

Commit 189f6b9e8476ea4937cc6a342a79daaa5875985b

Authored by 杨鸣坤
1 parent 980f742f

楚江ERP：总数量回显

Inline Side-by-side
Showing 3 changed files with 17 additions and 0 deletions
@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.entity.SpecLockDelayApplication; @@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
7 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 9
  10 +import java.math.BigDecimal;
10 import java.time.LocalDate; 11 import java.time.LocalDate;
11 12
12 /** 13 /**
@@ -99,6 +100,12 @@ public class GetSpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplicati @@ -99,6 +100,12 @@ public class GetSpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplicati
99 @ApiModelProperty("生产厂名称") 100 @ApiModelProperty("生产厂名称")
100 private String workshopName; 101 private String workshopName;
101 102
  103 + /**
  104 + * 数量（t）
  105 + */
  106 + @ApiModelProperty(value = "数量（t）")
  107 + private BigDecimal totalQuantity;
  108 +
102 public GetSpecLockDelayApplicationBo() { 109 public GetSpecLockDelayApplicationBo() {
103 110
104 } 111 }
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import org.hibernate.validator.constraints.Length; 9 import org.hibernate.validator.constraints.Length;
10 10
  11 +import java.math.BigDecimal;
11 import java.time.LocalDate; 12 import java.time.LocalDate;
12 13
13 /** 14 /**
@@ -99,6 +100,12 @@ public class QuerySpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplica @@ -99,6 +100,12 @@ public class QuerySpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplica
99 @ApiModelProperty(value = "延迟原因") 100 @ApiModelProperty(value = "延迟原因")
100 private String delayReason; 101 private String delayReason;
101 102
  103 + /**
  104 + * 数量（t）
  105 + */
  106 + @ApiModelProperty(value = "数量（t）")
  107 + private BigDecimal totalQuantity;
  108 +
102 public QuerySpecLockDelayApplicationBo() { 109 public QuerySpecLockDelayApplicationBo() {
103 110
104 } 111 }
@@ -144,6 +144,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -144,6 +144,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
144 result.setApprovalStatusName(auditName); 144 result.setApprovalStatusName(auditName);
145 result.setContractType(contractDistributorStandard.getType()); 145 result.setContractType(contractDistributorStandard.getType());
146 result.setWorkshopName(workshop.getName()); 146 result.setWorkshopName(workshop.getName());
  147 + result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
147 }); 148 });
148 149
149 return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); 150 return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
@@ -181,6 +182,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -181,6 +182,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
181 result.setApprovalStatusName(sysDataDicItem.getName()); 182 result.setApprovalStatusName(sysDataDicItem.getName());
182 result.setContractType(contractDistributorStandard.getType()); 183 result.setContractType(contractDistributorStandard.getType());
183 result.setWorkshopName(workshop.getName()); 184 result.setWorkshopName(workshop.getName());
  185 + result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
184 186
185 return InvokeResultBuilder.success(result); 187 return InvokeResultBuilder.success(result);
186 } 188 }
@@ -243,6 +245,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController { @@ -243,6 +245,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
243 result.setContractType(contractDistributorStandard.getType()); 245 result.setContractType(contractDistributorStandard.getType());
244 result.setWorkshopName(workshop.getName()); 246 result.setWorkshopName(workshop.getName());
245 result.setApplicationCount(CollectionUtils.isEmpty(specLockDelayApplicationList) ? 1 : specLockDelayApplicationList.size() + 1); 247 result.setApplicationCount(CollectionUtils.isEmpty(specLockDelayApplicationList) ? 1 : specLockDelayApplicationList.size() + 1);
  248 + result.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
246 249
247 return InvokeResultBuilder.success(result); 250 return InvokeResultBuilder.success(result);
248 } 251 }