朱园亮 / xingyun-erp · Commits

Commit fd6064ed30f65a20c56a603ac8675179dad0e0df

Authored by 房远帅
1 parent d7ca340c

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

Inline Side-by-side
Showing 1 changed file with 10 additions and 0 deletions
... ... @@ -243,6 +243,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
243 243 QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
244 244 vo1.setContractId(id);
245 245 vo1.setExamineStatus("AUDIT");
  246 + vo1.setType("PRODUCTION");
246 247 List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
247 248 if (CollectionUtils.isNotEmpty(query1)) {
248 249 bo.setShippingStatusName("审批中");
... ... @@ -250,6 +251,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
250 251 QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
251 252 vo2.setContractId(id);
252 253 vo2.setStatus("ISSUED");
  254 + vo2.setType("PRODUCTION");
253 255 List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
254 256 if (CollectionUtils.isNotEmpty(query2)) {
255 257 bo.setShippingStatusName("生产中");
... ... @@ -257,6 +259,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
257 259 QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
258 260 vo3.setContractId(id);
259 261 vo3.setStatus("TRANSIT");
  262 + vo3.setType("PRODUCTION");
260 263 List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
261 264 if (CollectionUtils.isNotEmpty(query3)) {
262 265 bo.setShippingStatusName("已发货");
... ... @@ -264,6 +267,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
264 267 QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
265 268 vo4.setContractId(id);
266 269 vo4.setStatus("SHIPPED");
  270 + vo4.setType("PRODUCTION");
267 271 List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
268 272 if (CollectionUtils.isNotEmpty(query4)) {
269 273 bo.setShippingStatusName("已发货");
... ... @@ -271,6 +275,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
271 275 QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
272 276 vo5.setContractId(id);
273 277 vo5.setStatus("DELIVERED");
  278 + vo5.setType("PRODUCTION");
274 279 List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
275 280 if (CollectionUtils.isNotEmpty(query5)) {
276 281 bo.setShippingStatusName("已签收");
... ... @@ -382,6 +387,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
382 387 QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
383 388 vo1.setContractId(id);
384 389 vo1.setExamineStatus("AUDIT");
  390 + vo1.setType("PRODUCTION");
385 391 List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
386 392 if (CollectionUtils.isNotEmpty(query1)) {
387 393 result.setShippingStatusName("审批中");
... ... @@ -389,6 +395,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
389 395 QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
390 396 vo2.setContractId(id);
391 397 vo2.setStatus("ISSUED");
  398 + vo2.setType("PRODUCTION");
392 399 List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
393 400 if (CollectionUtils.isNotEmpty(query2)) {
394 401 result.setShippingStatusName("生产中");
... ... @@ -396,6 +403,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
396 403 QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
397 404 vo3.setContractId(id);
398 405 vo3.setStatus("TRANSIT");
  406 + vo3.setType("PRODUCTION");
399 407 List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
400 408 if (CollectionUtils.isNotEmpty(query3)) {
401 409 result.setShippingStatusName("已发货");
... ... @@ -403,6 +411,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
403 411 QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
404 412 vo4.setContractId(id);
405 413 vo4.setStatus("SHIPPED");
  414 + vo4.setType("PRODUCTION");
406 415 List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
407 416 if (CollectionUtils.isNotEmpty(query4)) {
408 417 result.setShippingStatusName("已发货");
... ... @@ -410,6 +419,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
410 419 QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
411 420 vo5.setContractId(id);
412 421 vo5.setStatus("DELIVERED");
  422 + vo5.setType("PRODUCTION");
413 423 List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
414 424 if (CollectionUtils.isNotEmpty(query5)) {
415 425 result.setShippingStatusName("已签收");
... ...