From 459b553d5253bee849438147f1fffa06da6b53f8 Mon Sep 17 00:00:00 2001 From: vayne Date: Thu, 4 Jul 2024 16:04:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessOrderController.java | 2 +- .../views/scm/saleCenter/saleOrder/index.vue | 4 +- .../saleCenter/saleOutBoundNotice/form.vue | 45 ++++++++++++++++++- 3 files changed, 47 insertions(+), 4 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 3ed1720d..c4a48534 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 @@ -618,7 +618,7 @@ public class BusinessOrderController { if (StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("1")) { entity.setStatus("3");//采购单审核通过后状态改为待入库 }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("1")){ - entity.setStatus("3");//销售单仓配审核通过后状态改为待锁定 + entity.setStatus("4");//销售单仓配审核通过后状态改为待锁定 }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){ entity.setStatus("4");//销售单直送审核通过后状态改为待出库 } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue index cc7f968a..82c49fea 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue @@ -184,10 +184,10 @@ 详情 -