mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(sip): 优化订单发货状态更新逻辑 

- 修改 InventoryDeliveryServiceImpl 中更新订单发货状态的逻辑
- 添加 versionCode 字段以支持版本控制
- 更新 ProjectOrderInfoMapper.xml 中的 SQL语句，正确处理版本号
dev_1.0.0
chenhao 2025-09-15 14:39:56 +08:00
parent f62c51e2ac
commit 436fed388f
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/templates/system/agent/agent.html
View File

@ -92,7 +92,7 @@
visible: false visible: false
}, },
{ {
width: 100, width: 160,
field: 'agentCode', field: 'agentCode',
title: '代表处编码' title: '代表处编码'
}, },

2
ruoyi-admin/src/main/resources/templates/system/customer/info.html
View File

@ -144,7 +144,7 @@
visible: false visible: false
}, },
{ {
width:150, width:160,
field: 'customerCode', field: 'customerCode',
title: '客户编码' title: '客户编码'
}, },

8
ruoyi-admin/src/main/resources/templates/system/partner/partner.html
View File

@ -112,7 +112,7 @@
visible: false visible: false
}, },
{ {
width:100, width:160,
field: 'partnerCode', field: 'partnerCode',
title: '代理商编码' title: '代理商编码'
}, },
@ -132,7 +132,7 @@
title: '市' title: '市'
}, },
{ {
width:100, width:200,
field: 'address', field: 'address',
title: '详细地址' title: '详细地址'
}, },
@ -147,7 +147,7 @@
title: '联系电话' title: '联系电话'
}, },
{ {
width:100, width:180,
class:'word-warp', class:'word-warp',
field: 'contactEmail', field: 'contactEmail',
title: '邮件' title: '邮件'
@ -166,7 +166,7 @@
title: '创建时间' title: '创建时间'
}, },
{ {
width:170, width:270,
title: '操作', title: '操作',
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {

2
ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html vendored
View File

@ -97,7 +97,7 @@
visible: false visible: false
}, },
{ {
width: '100', width: '160',
field: 'vendorCode', field: 'vendorCode',
title: '制造商编码' title: '制造商编码'
}, },

1
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -257,6 +257,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//修改订单的发货状态 //修改订单的发货状态
ProjectOrderInfo updateOrder = new ProjectOrderInfo(); ProjectOrderInfo updateOrder = new ProjectOrderInfo();
updateOrder.setOrderCode(inventoryDelivery.getOrderCode()); updateOrder.setOrderCode(inventoryDelivery.getOrderCode());
updateOrder.setVersionCode("add");
updateOrder.setUpdateTime(new Date()); updateOrder.setUpdateTime(new Date());
updateOrder.setUpdateBy(ShiroUtils.getUserId().toString()); updateOrder.setUpdateBy(ShiroUtils.getUserId().toString());
updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode()); updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode());

4
ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
View File

@ -493,8 +493,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="versionCode != null"> <if test="versionCode != null">
<choose> <choose>
<when test="orderCode == 'add'.toString()">order_code = cast(order_code as int) +1,</when> <when test="versionCode == 'add'.toString()">version_code = cast(version_code as int) +1,</when>
<otherwise>order_code = #{orderCode},</otherwise> <otherwise>version_code = #{versionCode},</otherwise>
</choose> </choose>
</if> </if>
<if test="processType != null and processType!=''">process_type=${processType},</if> <if test="processType != null and processType!=''">process_type=${processType},</if>