朱园亮 / xingyun-erp · Commits

Commit d7ca340c920bab4ade15a852182f435b5d0f031c

Authored by 房远帅
1 parent 00da7bc0

楚江ERP:标准合同：展示合同状态

Inline Side-by-side
Showing 5 changed files with 106 additions and 6 deletions
@@ -425,6 +425,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor @@ -425,6 +425,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
425 @ApiModelProperty(value = "是否展示标准合同审核按钮") 425 @ApiModelProperty(value = "是否展示标准合同审核按钮")
426 private Boolean standardShowExamine; 426 private Boolean standardShowExamine;
427 427
  428 + /**
  429 + * 合同状态
  430 + */
  431 + @ApiModelProperty(value = "合同状态")
  432 + private String shippingStatusName;
  433 +
428 public GetContractDistributorStandardBo() { 434 public GetContractDistributorStandardBo() {
429 435
430 } 436 }
@@ -168,9 +168,9 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut @@ -168,9 +168,9 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
168 private Boolean standardShowExamine; 168 private Boolean standardShowExamine;
169 169
170 /** 170 /**
171 - * 发货状态 171 + * 合同状态
172 */ 172 */
173 - @ApiModelProperty(value = "发货状态") 173 + @ApiModelProperty(value = "合同状态")
174 private String shippingStatusName; 174 private String shippingStatusName;
175 175
176 /** 176 /**
@@ -31,18 +31,17 @@ import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo; @@ -31,18 +31,17 @@ import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
31 import com.lframework.xingyun.sc.bo.contract.GetContractStdProcessingLineBo; 31 import com.lframework.xingyun.sc.bo.contract.GetContractStdProcessingLineBo;
32 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo; 32 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
33 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool; 33 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool;
34 -import com.lframework.xingyun.sc.entity.ContractDistributorLine;  
35 -import com.lframework.xingyun.sc.entity.ContractDistributorStandard;  
36 -import com.lframework.xingyun.sc.entity.ContractFramework;  
37 -import com.lframework.xingyun.sc.entity.ContractStdProcessingLine; 34 +import com.lframework.xingyun.sc.entity.*;
38 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService; 35 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
39 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService; 36 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
40 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService; 37 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
41 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService; 38 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
  39 +import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
42 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil; 40 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
43 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo; 41 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
44 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo; 42 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
45 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo; 43 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
  44 +import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
46 import io.swagger.annotations.Api; 45 import io.swagger.annotations.Api;
47 import io.swagger.annotations.ApiImplicitParam; 46 import io.swagger.annotations.ApiImplicitParam;
48 import io.swagger.annotations.ApiModelProperty; 47 import io.swagger.annotations.ApiModelProperty;
@@ -59,6 +58,7 @@ import org.springframework.scheduling.annotation.Scheduled; @@ -59,6 +58,7 @@ import org.springframework.scheduling.annotation.Scheduled;
59 import org.springframework.validation.annotation.Validated; 58 import org.springframework.validation.annotation.Validated;
60 import org.springframework.web.bind.annotation.*; 59 import org.springframework.web.bind.annotation.*;
61 60
  61 +import javax.annotation.Resource;
62 import javax.servlet.http.HttpServletResponse; 62 import javax.servlet.http.HttpServletResponse;
63 import javax.validation.Valid; 63 import javax.validation.Valid;
64 import javax.validation.constraints.NotBlank; 64 import javax.validation.constraints.NotBlank;
@@ -107,6 +107,8 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -107,6 +107,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
107 private ContractFrameworkService contractFrameworkService; 107 private ContractFrameworkService contractFrameworkService;
108 @Autowired 108 @Autowired
109 private ContractStdProcessingLineService contractStdProcessingLineService; 109 private ContractStdProcessingLineService contractStdProcessingLineService;
  110 + @Resource
  111 + private PurchaseOrderInfoService purchaseOrderInfoService;
110 112
111 113
112 public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方 114 public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
@@ -234,6 +236,50 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -234,6 +236,50 @@ public class ContractDistributorStandardController extends DefaultBaseController
234 if (StringUtils.isNotBlank(bo.getStandardApproved())) { 236 if (StringUtils.isNotBlank(bo.getStandardApproved())) {
235 bo.setStandardApprovedName(auditCodeAndNameMap.get(bo.getStandardApproved())); 237 bo.setStandardApprovedName(auditCodeAndNameMap.get(bo.getStandardApproved()));
236 } 238 }
  239 + //合同状态(标准合同列表展示)
  240 + if (vo != null && "STANDARD".equals(vo.getStatus())) {
  241 + //合同ID
  242 + String id = bo.getId();
  243 + QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
  244 + vo1.setContractId(id);
  245 + vo1.setExamineStatus("AUDIT");
  246 + List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
  247 + if (CollectionUtils.isNotEmpty(query1)) {
  248 + bo.setShippingStatusName("审批中");
  249 + } else {
  250 + QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
  251 + vo2.setContractId(id);
  252 + vo2.setStatus("ISSUED");
  253 + List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
  254 + if (CollectionUtils.isNotEmpty(query2)) {
  255 + bo.setShippingStatusName("生产中");
  256 + } else {
  257 + QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
  258 + vo3.setContractId(id);
  259 + vo3.setStatus("TRANSIT");
  260 + List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
  261 + if (CollectionUtils.isNotEmpty(query3)) {
  262 + bo.setShippingStatusName("已发货");
  263 + } else {
  264 + QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
  265 + vo4.setContractId(id);
  266 + vo4.setStatus("SHIPPED");
  267 + List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
  268 + if (CollectionUtils.isNotEmpty(query4)) {
  269 + bo.setShippingStatusName("已发货");
  270 + } else {
  271 + QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
  272 + vo5.setContractId(id);
  273 + vo5.setStatus("DELIVERED");
  274 + List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
  275 + if (CollectionUtils.isNotEmpty(query5)) {
  276 + bo.setShippingStatusName("已签收");
  277 + }
  278 + }
  279 + }
  280 + }
  281 + }
  282 + }
237 }); 283 });
238 284
239 boPageResult.setDatas(boList); 285 boPageResult.setDatas(boList);
@@ -331,6 +377,48 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -331,6 +377,48 @@ public class ContractDistributorStandardController extends DefaultBaseController
331 377
332 result.setContractStdProcessingLineList(lineBoList); 378 result.setContractStdProcessingLineList(lineBoList);
333 } 379 }
  380 + //合同状态(标准合同列表展示)
  381 + if ("STANDARD".equals(data.getStatus())) {
  382 + QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
  383 + vo1.setContractId(id);
  384 + vo1.setExamineStatus("AUDIT");
  385 + List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
  386 + if (CollectionUtils.isNotEmpty(query1)) {
  387 + result.setShippingStatusName("审批中");
  388 + } else {
  389 + QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
  390 + vo2.setContractId(id);
  391 + vo2.setStatus("ISSUED");
  392 + List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
  393 + if (CollectionUtils.isNotEmpty(query2)) {
  394 + result.setShippingStatusName("生产中");
  395 + } else {
  396 + QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
  397 + vo3.setContractId(id);
  398 + vo3.setStatus("TRANSIT");
  399 + List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
  400 + if (CollectionUtils.isNotEmpty(query3)) {
  401 + result.setShippingStatusName("已发货");
  402 + } else {
  403 + QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
  404 + vo4.setContractId(id);
  405 + vo4.setStatus("SHIPPED");
  406 + List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
  407 + if (CollectionUtils.isNotEmpty(query4)) {
  408 + result.setShippingStatusName("已发货");
  409 + } else {
  410 + QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
  411 + vo5.setContractId(id);
  412 + vo5.setStatus("DELIVERED");
  413 + List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
  414 + if (CollectionUtils.isNotEmpty(query5)) {
  415 + result.setShippingStatusName("已签收");
  416 + }
  417 + }
  418 + }
  419 + }
  420 + }
  421 + }
334 422
335 return InvokeResultBuilder.success(result); 423 return InvokeResultBuilder.success(result);
336 } 424 }
@@ -107,4 +107,7 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ @@ -107,4 +107,7 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
107 */ 107 */
108 @ApiModelProperty("搜索关键字") 108 @ApiModelProperty("搜索关键字")
109 private String searchKey; 109 private String searchKey;
  110 +
  111 + @ApiModelProperty("合同")
  112 + private String contractId;
110 } 113 }
@@ -147,6 +147,9 @@ @@ -147,6 +147,9 @@
147 AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%') 147 AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
148 or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')) 148 or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))
149 </if> 149 </if>
  150 + <if test="vo.contractId != null and vo.contractId != ''">
  151 + AND tb.contract_id = #{vo.contractId}
  152 + </if>
150 </where> 153 </where>
151 ORDER BY tb.update_time DESC 154 ORDER BY tb.update_time DESC
152 </select> 155 </select>