From bc989be942790a521b996de36e0677926fad62f9 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 31 Dec 2024 10:32:01 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E3=80=81=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E3=80=81=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E3=80=81=E5=AF=BC=E5=87=BA=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E5=87=BA=E5=BA=93=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8A=A0=E4=B8=8A13=E9=83=A8=E5=88=86=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=8114=E5=85=A8=E9=83=A8=E6=94=B6=E8=B4=A7=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E7=A1=AE=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=96=B9=E6=B3=95=EF=BC=9A=E5=8A=A0=E4=B8=8A=E5=AF=B9?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=87=BA=E5=BA=93=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=B7=B2=E6=94=B6=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E7=AD=89=E4=BA=8E=E6=9C=AC=E6=AC=A1=E5=87=BA=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E5=85=A8=E9=83=A8=E6=94=B6=E8=B4=A7=EF=BC=9B?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E8=B4=A7=E6=95=B0=E5=A4=A7=E4=BA=8E0?= =?UTF-8?q?=E5=B0=8F=E4=BA=8E=E6=9C=AC=E6=AC=A1=E5=87=BA=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E4=B8=BA=E9=83=A8=E5=88=86=E6=94=B6=E8=B4=A7=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0=E7=AD=89=E4=BA=8E0=E4=B8=BA?= =?UTF-8?q?=E5=BE=85=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/domain/AftersalesOutOrder.java | 2 +- .../system/domain/SysSalesShippingInform.java | 2 +- .../Vo/ExportSalesShippingInformDetailVo.java | 2 +- .../SysSalesShippingInformServiceImpl.java | 31 +++++++++++++++++++ .../warehouse/domain/WarehouseOutOrder.java | 2 +- 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java index 5007ae55..5c0648c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesOutOrder.java @@ -30,7 +30,7 @@ public class AftersalesOutOrder extends BaseEntity /** 关联生产订单号 */ private String makeNo; - /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收） */ + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收、13部分收货、14全部收货） */ @Excel(name = "出库状态",dictType = "warehouse_out_status") private String warehouseOutStatus; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java index c7812146..8cdebc41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInform.java @@ -27,7 +27,7 @@ public class SysSalesShippingInform extends BaseEntity @Excel(name = "出库单号", width = 20, needMerge = true) private String outOrderCode; - /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消） */ + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收、13部分收货、14全部收货） */ // @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消") @Excel(name = "出库状态", dictType = "warehouse_out_status", width = 20, needMerge = true) private String warehouseOutStatus; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java index ef595bdf..ecfffcaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java @@ -20,7 +20,7 @@ public class ExportSalesShippingInformDetailVo { @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createTime; - /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消） */ + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收、13部分收货、14全部收货） */ // @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消") @Excel(name = "出库状态", dictType = "warehouse_out_status") private String warehouseOutStatus; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index acba8d31..9119b451 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -564,6 +564,37 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor processWithShippingDeviceId(withShippingDeviceIdList); } + + // 检查所有详情记录的已收货数与本次出货数对比，确定最终状态 + boolean allReceived = true; + boolean partiallyReceived = false; + + for (SysSalesShippingInformDetail detail : shippingInformDetailList) { + if (detail.getHasReceivingNum() == 0) { + allReceived = false; + } else if (detail.getHasReceivingNum() < detail.getThisShippingNum()) { + allReceived = false; + partiallyReceived = true; + } + } + if (allReceived) { + // 已收货数等于本次出货数 + sysSalesShippingInform.setWarehouseOutStatus("14");//全部收货 + } else if (partiallyReceived) { + // 已收货数大于0小于本次出货数 + sysSalesShippingInform.setWarehouseOutStatus("13");//部分收货 + } else { + // 已收货数等于0 + sysSalesShippingInform.setWarehouseOutStatus("9");//待收货 + } + + //更新销售出货通知 + int updateShippingInformResult = sysSalesShippingInformMapper.updateSysSalesShippingInformByOutOrderCode(sysSalesShippingInform); + if (updateShippingInformResult <= 0){ + throw new BusinessException("更新销售出货通知单数据失败"); + } + + //更新收货维护设备出库单数据 AftersalesOutOrder aftersalesOutOrder = new AftersalesOutOrder(); aftersalesOutOrder.setOutOrderCode(sysSalesShippingInform.getOutOrderCode()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java index 1d451a6a..435c0662 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrder.java @@ -30,7 +30,7 @@ public class WarehouseOutOrder extends BaseEntity /** 关联生产订单号 */ private String makeNo; - /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收） */ + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消、9待收货、10待验收、11部分验收、12全部验收、13部分收货、14全部收货） */ @Excel(name = "出库状态",dictType = "warehouse_out_status") private String warehouseOutStatus;