From 9ab497a1504591aed1e69d368f68d063e83f161b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 25 Apr 2025 11:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E8=AE=A1=E7=AE=97=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0=E5=8F=91=E8=B4=A7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverydemand/entity/DeliveryDemand.java | 3 ++- .../mapper/DeliveryDemandMapper.java | 6 ++++++ .../mapper/xml/DeliveryDemandMapper.xml | 5 +++++ .../service/IDeliveryDemandService.java | 17 ++++++++++++++++- .../service/impl/DeliveryDemandServiceImpl.java | 4 ++-- .../controller/VehicleDemandController.java | 2 +- .../service/impl/VehicleDemandServiceImpl.java | 4 ++++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java index 1a9c81a..9d212a5 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java @@ -109,7 +109,8 @@ public class DeliveryDemand implements Serializable { @Excel(name = "作业备注", width = 15) @ApiModelProperty(value = "作业备注") private java.lang.String workNotes; - /**当前状态*/ + /**当前状态 0-创建, 1-已合并需求, 2-计算车辆需求中, 3-发送车辆需求, 4-等待装车, + * 5-车辆离厂（完成）, 6-取消, 7-超期无效*/ @Excel(name = "当前状态", width = 15, dicCode = "current_status") @Dict(dicCode = "current_status") @ApiModelProperty(value = "当前状态") diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java index 3d76d17..c2f23cc 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/DeliveryDemandMapper.java @@ -20,4 +20,10 @@ public interface DeliveryDemandMapper extends BaseMapper { @Param("pickUpHub") String pickUpHub, @Param("shipDate") Date shipDate, @Param("sequence") String sequence); + /** + * 更新发货需求 + * @param vdNo 用车需求编号 + * @param currentStatus 当前状态 + */ + void updateByVdNo(String vdNo, String currentStatus); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml index 2940889..17b6d98 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/mapper/xml/DeliveryDemandMapper.xml @@ -11,4 +11,9 @@ and pick_up_hub = #{pickUpHub} and ship_date = #{shipDate} + + + update tms_delivery_demand set current_status = #{currentStatus} + where vd_no = #{vdNo} + diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java index bc4fca8..cd20af1 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java @@ -14,9 +14,24 @@ import java.util.List; */ public interface IDeliveryDemandService extends IService { + /** + * 手动合并 + * @param ids + * @return + */ Result handleMerge(List ids); + /** + * 根据料号、规格、发货数量计算托盘数 + * @param deliveryDemand + * @return + */ Result getPalletsNum(DeliveryDemand deliveryDemand); - void updateByVdNo(String vdNo); + /** + * 更新发货需求 + * @param vdNo 用车需求编号 + * @param currentStatus 当前状态 + */ + void updateByVdNo(String vdNo, String currentStatus); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java index d580a28..815b04b 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java @@ -120,10 +120,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.eq(DeliveryDemand::getVdNo, vdNo) - .set(DeliveryDemand::getCurrentStatus, '0'); + .set(DeliveryDemand::getCurrentStatus, currentStatus); deliveryDemandMapper.update(new DeliveryDemand(), lambdaUpdateWrapper); } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java index de00fbc..73c7bdc 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java @@ -125,7 +125,7 @@ public class VehicleDemandController extends JeecgController carCount(VehicleDemand vehicleDemand) { @@ -67,6 +69,8 @@ public class VehicleDemandServiceImpl extends ServiceImpl vehicleDemandCounts = convertToVehicleDemandCountList(solution.getVehicleCounts(), vehicleDemand); // 5.新增 vehicleDemandCountService.saveBatch(vehicleDemandCounts); + // 6.更新发货需求当前状态 + deliveryDemandMapper.updateByVdNo(vehicleDemand.getVdNo(), "2"); log.info("用车需求计算，用车需求编号：{}，方案：{}，费用：{}",vehicleDemand.getVdNo(), solution.getVehicleCounts(),solution.getTotalCost()); return Result.OK("用车计算成功！");