From be3a93b35872505702b599369e835997a39df61f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Wed, 21 Aug 2024 16:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=E5=A2=9E=E5=8A=A0Order=E5=AD=97=E6=AE=B5=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0Temper=E7=9A=84Service=E5=92=8CServiceImpl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/TOngoodsshelfController.java | 9 +++++ .../com/ruoyi/business/domain/TEbsOrder.java | 33 +++++++++++++++++++ .../ruoyi/business/mapper/TemperMapper.java | 3 +- .../business/service/ITemperService.java | 7 ++++ .../service/impl/TemperServiceImpl.java | 11 +++++++ .../main/resources/mapper/TEbsOrderMapper.xml | 12 +++++-- 6 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 wms-business/src/main/java/com/ruoyi/business/service/ITemperService.java create mode 100644 wms-business/src/main/java/com/ruoyi/business/service/impl/TemperServiceImpl.java diff --git a/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java b/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java index 2213ae9..e249b71 100644 --- a/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java +++ b/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java @@ -218,6 +218,14 @@ public class TOngoodsshelfController extends BaseController logger.error("提交入库的数据为空"); return error(); } + // 查询当前入库的供应商 + TBaseProvider currentInProvider = tBaseProviderService.getOne(new LambdaQueryWrapper() + .eq(TBaseProvider::getRemark, "1") + .last("limit 1")); + if (currentInProvider == null) { + logger.error("没有正在入库的供应商，请开启后重试。"); + return error("没有正在入库的供应商，请开启后重试。"); + } // 入库id String lotId = OrderCodeFactory.getOrderCode("RK", ""); // 创建日期 @@ -369,6 +377,7 @@ public class TOngoodsshelfController extends BaseController } // 插入ebsOrder表 for (TEbsOrder targetOrder : targetOrders) { + targetOrder.setCreateDate(new Date()); itEbsOrderService.insertTEbsOrder(targetOrder); } } diff --git a/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java b/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java index 872e609..b55ccc6 100644 --- a/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java +++ b/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java @@ -2,9 +2,12 @@ package com.ruoyi.business.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 【EBS订单信息】对象 t_ebs_order * @@ -190,6 +193,20 @@ public class TEbsOrder extends BaseEntity { @Excel(name = "订单物资收货检验优先级") @TableField("checkPriority") private String checkPriority; + /** + * 过期时间 + */ + @Excel(name = "过期时间") + @TableField("dueDate") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dueDate; + /** + * 创建时间 + */ + @Excel(name = "创建时间") + @TableField("createDate") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createDate; public String getPhaSegment1() { return phaSegment1; @@ -390,5 +407,21 @@ public class TEbsOrder extends BaseEntity { public void setCheckPriority(String checkPriority) { this.checkPriority = checkPriority; } + + public Date getDueDate() { + return dueDate; + } + + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } } diff --git a/wms-business/src/main/java/com/ruoyi/business/mapper/TemperMapper.java b/wms-business/src/main/java/com/ruoyi/business/mapper/TemperMapper.java index d014973..b311f15 100644 --- a/wms-business/src/main/java/com/ruoyi/business/mapper/TemperMapper.java +++ b/wms-business/src/main/java/com/ruoyi/business/mapper/TemperMapper.java @@ -1,12 +1,13 @@ package com.ruoyi.business.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.business.domain.Temper; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface TemperMapper { +public interface TemperMapper extends BaseMapper { /** * 查询温度列表 diff --git a/wms-business/src/main/java/com/ruoyi/business/service/ITemperService.java b/wms-business/src/main/java/com/ruoyi/business/service/ITemperService.java new file mode 100644 index 0000000..3f46389 --- /dev/null +++ b/wms-business/src/main/java/com/ruoyi/business/service/ITemperService.java @@ -0,0 +1,7 @@ +package com.ruoyi.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.business.domain.Temper; + +public interface ITemperService extends IService { +} diff --git a/wms-business/src/main/java/com/ruoyi/business/service/impl/TemperServiceImpl.java b/wms-business/src/main/java/com/ruoyi/business/service/impl/TemperServiceImpl.java new file mode 100644 index 0000000..8171789 --- /dev/null +++ b/wms-business/src/main/java/com/ruoyi/business/service/impl/TemperServiceImpl.java @@ -0,0 +1,11 @@ +package com.ruoyi.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.business.domain.Temper; +import com.ruoyi.business.mapper.TemperMapper; +import com.ruoyi.business.service.ITemperService; +import org.springframework.stereotype.Service; + +@Service +public class TemperServiceImpl extends ServiceImpl implements ITemperService { +} diff --git a/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml b/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml index e65026e..8b4666a 100644 --- a/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml +++ b/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml @@ -28,6 +28,8 @@ + + @@ -40,6 +42,7 @@ and phaSegment1 = #{phaSegment1} and itemId = #{itemId} + order by dueDate; @@ -70,6 +73,8 @@ receivingRoutingId, lotControl, checkPriority, + dueDate, + createDate, #{phaSegment1}, @@ -97,6 +102,8 @@ #{receivingRoutingId}, #{lotControl}, #{checkPriority}, + #{dueDate}, + #{createDate}, @@ -126,11 +133,12 @@ receivingRoutingId = #{receivingRoutingId}, lotControl = #{lotControl}, checkPriority = #{checkPriority}, + createDate = #{createDate}, - where phaSegment1 = #{phaSegment1} and itemId = #{itemId} + where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} - delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} + delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} \ No newline at end of file