liangzhou/wms_snN7pp_nantong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增采购单本地行号

Browse Source
This commit is contained in:
15066119699 2025-02-25 14:13:45 +08:00
parent c55d46329c
commit 5088c23b30
5 changed files with 92 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java
View File

@ -402,10 +402,12 @@ public class TOngoodsshelfController extends BaseController
return "当前入库物料在EBS中没有对应订单！"; return "当前入库物料在EBS中没有对应订单！";
} }
// 插入ebsOrder表 // 插入ebsOrder表
int i = 1;
for (TEbsOrder targetOrder : targetOrders) { for (TEbsOrder targetOrder : targetOrders) {
targetOrder.setCreateDate(new Date()); targetOrder.setCreateDate(new Date());
targetOrder.setCreateTime(new Date()); targetOrder.setCreateTime(new Date());
targetOrder.setUpdateTime(new Date()); targetOrder.setUpdateTime(new Date());
targetOrder.setLocalLineNum(i++);
itEbsOrderService.insertTEbsOrder(targetOrder); itEbsOrderService.insertTEbsOrder(targetOrder);
} }
} }

25
wms-admin/target/classes/application-druid.yml
View File

@ -5,16 +5,19 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
druid: druid:
# 主库数据源 # 主库数据源
# master:
# url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
## password: ntscc@2018
# password: root
master: master:
url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: developer url: jdbc:mysql://39.98.53.180:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: developer # username: root
# password: ntscc@2018
username: tony
password: Tony123
# password: root
# master:
# url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: developer
# password: developer
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
@ -41,7 +44,7 @@ spring:
testWhileIdle: true testWhileIdle: true
testOnBorrow: false testOnBorrow: false
testOnReturn: false testOnReturn: false
webStatFilter: webStatFilter:
enabled: true enabled: true
statViewServlet: statViewServlet:
enabled: true enabled: true
@ -60,4 +63,4 @@ spring:
merge-sql: true merge-sql: true
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true

46
wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java
View File

@ -208,6 +208,18 @@ public class TEbsOrder extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate; private Date createDate;
@Excel(name = "本地行号")
@TableField("localLineNum")
private Integer localLineNum;
public Integer getLocalLineNum() {
return localLineNum;
}
public void setLocalLineNum(Integer localLineNum) {
this.localLineNum = localLineNum;
}
public String getPhaSegment1() { public String getPhaSegment1() {
return phaSegment1; return phaSegment1;
} }
@ -423,5 +435,39 @@ public class TEbsOrder extends BaseEntity {
public void setCreateDate(Date createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Override
public String toString() {
return "TEbsOrder{" +
"phaSegment1='" + phaSegment1 + '\'' +
", shipmentNum=" + shipmentNum +
", distributionNum=" + distributionNum +
", supplyTypeCode='" + supplyTypeCode + '\'' +
", msQuantity=" + msQuantity +
", poDistributionId=" + poDistributionId +
", poHeaderId=" + poHeaderId +
", poLineId=" + poLineId +
", lineNum=" + lineNum +
", orgId=" + orgId +
", shipToOrganizationId=" + shipToOrganizationId +
", itemId=" + itemId +
", itemDescription='" + itemDescription + '\'' +
", unitMeasLookupCode='" + unitMeasLookupCode + '\'' +
", unitPrice=" + unitPrice +
", quantity=" + quantity +
", quantityReceived=" + quantityReceived +
", closedCode='" + closedCode + '\'' +
", lineLocationId=" + lineLocationId +
", vendorId=" + vendorId +
", vendorName='" + vendorName + '\'' +
", wipEntityId='" + wipEntityId + '\'' +
", receivingRoutingId=" + receivingRoutingId +
", lotControl='" + lotControl + '\'' +
", checkPriority='" + checkPriority + '\'' +
", dueDate=" + dueDate +
", createDate=" + createDate +
", localLineNum=" + localLineNum +
'}';
}
} }

48
wms-business/src/main/resources/mapper/TEbsOrderMapper.xml
View File

@ -32,6 +32,7 @@
<result property="createDate" column="createDate" /> <result property="createDate" column="createDate" />
<result property="createTime" column="CREATE_TIME" /> <result property="createTime" column="CREATE_TIME" />
<result property="updateTime" column="UPDATE_TIME" /> <result property="updateTime" column="UPDATE_TIME" />
<result property="localLineNum" column="local_line_num" />
</resultMap> </resultMap>
<sql id="selectTEbsOrderALl"> <sql id="selectTEbsOrderALl">
@ -43,6 +44,7 @@
<where> <where>
<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>
<if test="localLineNum != null"> and local_line_num = #{localLineNum}</if>
</where> </where>
order by dueDate; order by dueDate;
</select> </select>
@ -78,6 +80,7 @@
<if test="dueDate != null">dueDate,</if> <if test="dueDate != null">dueDate,</if>
<if test="createDate != null">createDate,</if> <if test="createDate != null">createDate,</if>
<if test="createTime != null">CREATE_TIME,</if> <if test="createTime != null">CREATE_TIME,</if>
<if test="localLineNum != null">local_line_num,</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>
@ -108,40 +111,11 @@
<if test="dueDate != null">#{dueDate},</if> <if test="dueDate != null">#{dueDate},</if>
<if test="createDate != null">#{createDate},</if> <if test="createDate != null">#{createDate},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="localLineNum != null">#{localLineNum},</if>
</trim> </trim>
</insert> </insert>
<update id="updateById" parameterType="TEbsOrder">
update t_ebs_order
<trim prefix="SET" suffixOverrides=",">
<if test="shipmentNum != null">shipmentNum = #{shipmentNum},</if>
<if test="distributionNum != null">distributionNum = #{distributionNum},</if>
<if test="supplyTypeCode != null">supplyTypeCode = #{supplyTypeCode},</if>
<if test="msQuantity != null">msQuantity = #{msQuantity},</if>
<if test="poDistributionId != null">poDistributionId = #{poDistributionId},</if>
<if test="poHeaderId != null">poHeaderId = #{poHeaderId},</if>
<if test="poLineId != null">poLineId = #{poLineId},</if>
<if test="lineNum != null">lineNum = #{lineNum},</if>
<if test="orgId != null">orgId = #{orgId},</if>
<if test="shipToOrganizationId != null">shipToOrganizationId = #{shipToOrganizationId},</if>
<if test="itemDescription != null">itemDescription = #{itemDescription},</if>
<if test="unitMeasLookupCode != null">unitMeasLookupCode = #{unitMeasLookupCode},</if>
<if test="unitPrice != null">unitPrice = #{unitPrice},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="quantityReceived != null">quantityReceived = #{quantityReceived},</if>
<if test="closedCode != null">closedCode = #{closedCode},</if>
<if test="lineLocationId != null">lineLocationId = #{lineLocationId},</if>
<if test="vendorId != null">vendorId = #{vendorId},</if>
<if test="vendorName != null">vendorName = #{vendorName},</if>
<if test="wipEntityId != null">wipEntityId = #{wipEntityId},</if>
<if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
<if test="lotControl != null">lotControl = #{lotControl},</if>
<if test="checkPriority != null">checkPriority = #{checkPriority},</if>
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<update id="updateTEbsOrder" parameterType="TEbsOrder"> <update id="updateTEbsOrder" parameterType="TEbsOrder">
update t_ebs_order update t_ebs_order
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
@ -170,10 +144,18 @@
<if test="checkPriority != null">checkPriority = #{checkPriority},</if> <if test="checkPriority != null">checkPriority = #{checkPriority},</if>
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if> <if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
</trim> </trim>
where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} <where>
phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
<if test="localLineNum != null">and local_line_num = #{localLineNum}</if>
</where>
</update> </update>
<delete id="deleteTEbsOrder" parameterType="TEbsOrder"> <delete id="deleteTEbsOrder" parameterType="TEbsOrder">
delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} delete from t_ebs_order
<where>
phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
<if test="localLineNum != null">and local_line_num = #{localLineNum}</if>
</where>
</delete> </delete>
</mapper> </mapper>

48
wms-business/target/classes/mapper/TEbsOrderMapper.xml
View File

@ -32,6 +32,7 @@
<result property="createDate" column="createDate" /> <result property="createDate" column="createDate" />
<result property="createTime" column="CREATE_TIME" /> <result property="createTime" column="CREATE_TIME" />
<result property="updateTime" column="UPDATE_TIME" /> <result property="updateTime" column="UPDATE_TIME" />
<result property="localLineNum" column="local_line_num" />
</resultMap> </resultMap>
<sql id="selectTEbsOrderALl"> <sql id="selectTEbsOrderALl">
@ -43,6 +44,7 @@
<where> <where>
<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>
<if test="localLineNum != null"> and local_line_num = #{localLineNum}</if>
</where> </where>
order by dueDate; order by dueDate;
</select> </select>
@ -78,6 +80,7 @@
<if test="dueDate != null">dueDate,</if> <if test="dueDate != null">dueDate,</if>
<if test="createDate != null">createDate,</if> <if test="createDate != null">createDate,</if>
<if test="createTime != null">CREATE_TIME,</if> <if test="createTime != null">CREATE_TIME,</if>
<if test="localLineNum != null">local_line_num,</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>
@ -108,40 +111,11 @@
<if test="dueDate != null">#{dueDate},</if> <if test="dueDate != null">#{dueDate},</if>
<if test="createDate != null">#{createDate},</if> <if test="createDate != null">#{createDate},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="localLineNum != null">#{localLineNum},</if>
</trim> </trim>
</insert> </insert>
<update id="updateById" parameterType="TEbsOrder">
update t_ebs_order
<trim prefix="SET" suffixOverrides=",">
<if test="shipmentNum != null">shipmentNum = #{shipmentNum},</if>
<if test="distributionNum != null">distributionNum = #{distributionNum},</if>
<if test="supplyTypeCode != null">supplyTypeCode = #{supplyTypeCode},</if>
<if test="msQuantity != null">msQuantity = #{msQuantity},</if>
<if test="poDistributionId != null">poDistributionId = #{poDistributionId},</if>
<if test="poHeaderId != null">poHeaderId = #{poHeaderId},</if>
<if test="poLineId != null">poLineId = #{poLineId},</if>
<if test="lineNum != null">lineNum = #{lineNum},</if>
<if test="orgId != null">orgId = #{orgId},</if>
<if test="shipToOrganizationId != null">shipToOrganizationId = #{shipToOrganizationId},</if>
<if test="itemDescription != null">itemDescription = #{itemDescription},</if>
<if test="unitMeasLookupCode != null">unitMeasLookupCode = #{unitMeasLookupCode},</if>
<if test="unitPrice != null">unitPrice = #{unitPrice},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="quantityReceived != null">quantityReceived = #{quantityReceived},</if>
<if test="closedCode != null">closedCode = #{closedCode},</if>
<if test="lineLocationId != null">lineLocationId = #{lineLocationId},</if>
<if test="vendorId != null">vendorId = #{vendorId},</if>
<if test="vendorName != null">vendorName = #{vendorName},</if>
<if test="wipEntityId != null">wipEntityId = #{wipEntityId},</if>
<if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
<if test="lotControl != null">lotControl = #{lotControl},</if>
<if test="checkPriority != null">checkPriority = #{checkPriority},</if>
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<update id="updateTEbsOrder" parameterType="TEbsOrder"> <update id="updateTEbsOrder" parameterType="TEbsOrder">
update t_ebs_order update t_ebs_order
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
@ -170,10 +144,18 @@
<if test="checkPriority != null">checkPriority = #{checkPriority},</if> <if test="checkPriority != null">checkPriority = #{checkPriority},</if>
<if test="updateTime != null">UPDATE_TIME = #{updateTime},</if> <if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
</trim> </trim>
where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} <where>
phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
<if test="localLineNum != null">and local_line_num = #{localLineNum}</if>
</where>
</update> </update>
<delete id="deleteTEbsOrder" parameterType="TEbsOrder"> <delete id="deleteTEbsOrder" parameterType="TEbsOrder">
delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate} delete from t_ebs_order
<where>
phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
<if test="localLineNum != null">and local_line_num = #{localLineNum}</if>
</where>
</delete> </delete>
</mapper> </mapper>