From e36d3d010ccdbecf599ad9f5e5674c65ad99d7d8 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Fri, 26 Apr 2024 18:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jnpf/controller/BusinessOrderController.java    | 4 ++--
 .../java/jnpf/controller/WarehousingOutboundController.java   | 4 ++--
 .../src/views/scm/purchaseCenter/purchaseOrder/form.vue       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
             entity.setProductByContractModelList(productByContractModelList);
             QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
-            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstCustomId());
+            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
             subjectQueryWrapper.isNull("f_delete_mark");
             List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
             entity.setSubjectbasicEntityList(subjectbasicEntityList);
@@ -1047,7 +1047,7 @@ public class BusinessOrderController {
             List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
             entity.setProductByContractModelList(productByContractModelList);
             QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
-            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstSupplyId());
+            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
             List<SubjectbasicEntity> 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 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('deliveryType')">
             <jnpf-form-tip-item label="配送方式" v-if="judgeShow('deliveryType')" prop="deliveryType">
-              <JnpfSelect v-model="dataForm.deliveryType" v-if="!this.productCreate"
+              <JnpfSelect v-model="dataForm.deliveryType" v-if="this.productCreate"
                 @change="deliveryTypeMethod" placeholder="请选择" :disabled="true" clearable
                 :style='{ "width": "100%" }' :options="deliveryTypeOptions"
                 :props="deliveryTypeProps">