代码更新:
1.增加Order字段 2.增加Temper的Service和ServiceImpl
This commit is contained in:
parent
d9d5263428
commit
be3a93b358
|
|
@ -218,6 +218,14 @@ public class TOngoodsshelfController extends BaseController
|
||||||
logger.error("提交入库的数据为空");
|
logger.error("提交入库的数据为空");
|
||||||
return error();
|
return error();
|
||||||
}
|
}
|
||||||
|
// 查询当前入库的供应商
|
||||||
|
TBaseProvider currentInProvider = tBaseProviderService.getOne(new LambdaQueryWrapper<TBaseProvider>()
|
||||||
|
.eq(TBaseProvider::getRemark, "1")
|
||||||
|
.last("limit 1"));
|
||||||
|
if (currentInProvider == null) {
|
||||||
|
logger.error("没有正在入库的供应商,请开启后重试。");
|
||||||
|
return error("没有正在入库的供应商,请开启后重试。");
|
||||||
|
}
|
||||||
// 入库id
|
// 入库id
|
||||||
String lotId = OrderCodeFactory.getOrderCode("RK", "");
|
String lotId = OrderCodeFactory.getOrderCode("RK", "");
|
||||||
// 创建日期
|
// 创建日期
|
||||||
|
|
@ -369,6 +377,7 @@ public class TOngoodsshelfController extends BaseController
|
||||||
}
|
}
|
||||||
// 插入ebsOrder表
|
// 插入ebsOrder表
|
||||||
for (TEbsOrder targetOrder : targetOrders) {
|
for (TEbsOrder targetOrder : targetOrders) {
|
||||||
|
targetOrder.setCreateDate(new Date());
|
||||||
itEbsOrderService.insertTEbsOrder(targetOrder);
|
itEbsOrderService.insertTEbsOrder(targetOrder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,12 @@ package com.ruoyi.business.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 【EBS订单信息】对象 t_ebs_order
|
* 【EBS订单信息】对象 t_ebs_order
|
||||||
*
|
*
|
||||||
|
|
@ -190,6 +193,20 @@ public class TEbsOrder extends BaseEntity {
|
||||||
@Excel(name = "订单物资收货检验优先级")
|
@Excel(name = "订单物资收货检验优先级")
|
||||||
@TableField("checkPriority")
|
@TableField("checkPriority")
|
||||||
private String 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() {
|
public String getPhaSegment1() {
|
||||||
return phaSegment1;
|
return phaSegment1;
|
||||||
|
|
@ -390,5 +407,21 @@ public class TEbsOrder extends BaseEntity {
|
||||||
public void setCheckPriority(String checkPriority) {
|
public void setCheckPriority(String checkPriority) {
|
||||||
this.checkPriority = 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
package com.ruoyi.business.mapper;
|
package com.ruoyi.business.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.ruoyi.business.domain.Temper;
|
import com.ruoyi.business.domain.Temper;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface TemperMapper {
|
public interface TemperMapper extends BaseMapper<Temper> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询温度列表
|
* 查询温度列表
|
||||||
|
|
|
||||||
|
|
@ -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<Temper> {
|
||||||
|
}
|
||||||
|
|
@ -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<TemperMapper, Temper> implements ITemperService {
|
||||||
|
}
|
||||||
|
|
@ -28,6 +28,8 @@
|
||||||
<result property="receivingRoutingId" column="receivingRoutingId" />
|
<result property="receivingRoutingId" column="receivingRoutingId" />
|
||||||
<result property="lotControl" column="lotControl" />
|
<result property="lotControl" column="lotControl" />
|
||||||
<result property="checkPriority" column="checkPriority" />
|
<result property="checkPriority" column="checkPriority" />
|
||||||
|
<result property="dueDate" column="dueDate" />
|
||||||
|
<result property="createDate" column="createDate" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectTEbsOrderALl">
|
<sql id="selectTEbsOrderALl">
|
||||||
|
|
@ -40,6 +42,7 @@
|
||||||
<if test="phaSegment1 != null and phaSegment1 != ''"> and phaSegment1 = #{phaSegment1}</if>
|
<if test="phaSegment1 != null and phaSegment1 != ''"> and phaSegment1 = #{phaSegment1}</if>
|
||||||
<if test="itemId != null"> and itemId = #{itemId}</if>
|
<if test="itemId != null"> and itemId = #{itemId}</if>
|
||||||
</where>
|
</where>
|
||||||
|
order by dueDate;
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertTEbsOrder" parameterType="TEbsOrder">
|
<insert id="insertTEbsOrder" parameterType="TEbsOrder">
|
||||||
|
|
@ -70,6 +73,8 @@
|
||||||
<if test="receivingRoutingId != null">receivingRoutingId,</if>
|
<if test="receivingRoutingId != null">receivingRoutingId,</if>
|
||||||
<if test="lotControl != null">lotControl,</if>
|
<if test="lotControl != null">lotControl,</if>
|
||||||
<if test="checkPriority != null">checkPriority,</if>
|
<if test="checkPriority != null">checkPriority,</if>
|
||||||
|
<if test="dueDate != null">dueDate,</if>
|
||||||
|
<if test="createDate != null">createDate,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="phaSegment1 != null">#{phaSegment1},</if>
|
<if test="phaSegment1 != null">#{phaSegment1},</if>
|
||||||
|
|
@ -97,6 +102,8 @@
|
||||||
<if test="receivingRoutingId != null">#{receivingRoutingId},</if>
|
<if test="receivingRoutingId != null">#{receivingRoutingId},</if>
|
||||||
<if test="lotControl != null">#{lotControl},</if>
|
<if test="lotControl != null">#{lotControl},</if>
|
||||||
<if test="checkPriority != null">#{checkPriority},</if>
|
<if test="checkPriority != null">#{checkPriority},</if>
|
||||||
|
<if test="dueDate != null">#{dueDate},</if>
|
||||||
|
<if test="createDate != null">#{createDate},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|
@ -126,11 +133,12 @@
|
||||||
<if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
|
<if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
|
||||||
<if test="lotControl != null">lotControl = #{lotControl},</if>
|
<if test="lotControl != null">lotControl = #{lotControl},</if>
|
||||||
<if test="checkPriority != null">checkPriority = #{checkPriority},</if>
|
<if test="checkPriority != null">checkPriority = #{checkPriority},</if>
|
||||||
|
<if test="createDate != null">createDate = #{createDate},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where phaSegment1 = #{phaSegment1} and itemId = #{itemId}
|
where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<delete id="deleteTEbsOrder" parameterType="TEbsOrder">
|
<delete id="deleteTEbsOrder" parameterType="TEbsOrder">
|
||||||
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}
|
||||||
</delete>
|
</delete>
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue
Block a user