diff --git a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
index 4dade174..54a0d8f5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
+++ b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
@@ -92,7 +92,7 @@
visible: false
},
{
- width: 100,
+ width: 160,
field: 'agentCode',
title: '代表处编码'
},
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
index c820a59c..a56fd498 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -144,7 +144,7 @@
visible: false
},
{
- width:150,
+ width:160,
field: 'customerCode',
title: '客户编码'
},
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index e016bde2..9bf0f8fe 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -112,7 +112,7 @@
visible: false
},
{
- width:100,
+ width:160,
field: 'partnerCode',
title: '代理商编码'
},
@@ -132,7 +132,7 @@
title: '市'
},
{
- width:100,
+ width:200,
field: 'address',
title: '详细地址'
},
@@ -147,7 +147,7 @@
title: '联系电话'
},
{
- width:100,
+ width:180,
class:'word-warp',
field: 'contactEmail',
title: '邮件'
@@ -166,7 +166,7 @@
title: '创建时间'
},
{
- width:170,
+ width:270,
title: '操作',
align: 'center',
formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html b/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
index 3de956c1..75bb2498 100644
--- a/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
+++ b/ruoyi-admin/src/main/resources/templates/system/vendor/vendor.html
@@ -97,7 +97,7 @@
visible: false
},
{
- width: '100',
+ width: '160',
field: 'vendorCode',
title: '制造商编码'
},
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index d9a0a4b2..ee9484aa 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -257,6 +257,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
//修改订单的发货状态
ProjectOrderInfo updateOrder = new ProjectOrderInfo();
updateOrder.setOrderCode(inventoryDelivery.getOrderCode());
+ updateOrder.setVersionCode("add");
updateOrder.setUpdateTime(new Date());
updateOrder.setUpdateBy(ShiroUtils.getUserId().toString());
updateOrder.setDeliveryStatus(sum == allSum ? ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode() : ProjectOrderInfo.DeliveryStatusEnum.PART_DELIVERY.getCode());
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
index 581b0d8c..09c46c0d 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
@@ -493,8 +493,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- order_code = cast(order_code as int) +1,
- order_code = #{orderCode},
+ version_code = cast(version_code as int) +1,
+ version_code = #{versionCode},
process_type=${processType},