diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index a58548ae..52de225e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -1026,7 +1026,7 @@ public class BusinessOrderController { List productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId()); entity.setProductByContractModelList(productByContractModelList); QueryWrapper subjectQueryWrapper = new QueryWrapper<>(); - subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstCustomId()); + subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject()); subjectQueryWrapper.isNull("f_delete_mark"); List subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper); entity.setSubjectbasicEntityList(subjectbasicEntityList); @@ -1047,7 +1047,7 @@ public class BusinessOrderController { List productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId()); entity.setProductByContractModelList(productByContractModelList); QueryWrapper subjectQueryWrapper = new QueryWrapper<>(); - subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstSupplyId()); + subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject()); List subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper); entity.setSubjectbasicEntityList(subjectbasicEntityList); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java index 6dd7583c..c24e8cac 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java @@ -582,10 +582,10 @@ public class WarehousingOutboundController { BigDecimal max = receivedNum.add(strNum); if (max.equals(businessOrderEntity.getPlanPurchaseNum())){ businessOrderEntity.setReceivedNum(max); - businessOrderEntity.setStatus("5"); //已完成 + businessOrderEntity.setStatus("6"); //已完成 }else { businessOrderEntity.setReceivedNum(max); - businessOrderEntity.setStatus("4");//部分完成 + businessOrderEntity.setStatus("5");//部分完成 } businessOrderService.saveOrUpdate(businessOrderEntity); } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue index a4c10f42..d06d8da9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue @@ -501,7 +501,7 @@ -