root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat] 

销售管理 销售订单
销售订单实体类新增客户料号字段；
修改mapper相关语句，新增客户料号字段；
dev
王晓迪 4 months ago
parent
393ad2d020
commit
e7dcd8d7c3
2 changed files with 17 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
  2. 10
      ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

9
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
View File

@ -151,6 +151,7 @@ public class SysSalesOrder extends BaseEntity {
private Integer outBoundQuantity;
@Excel(name = "未出库数量")
private Integer unBoundQuantity;
private String enterpriseMaterialNo;
private String applyUser;
private Date applyTime;
private String submitInstanceId;
@ -669,6 +670,14 @@ public class SysSalesOrder extends BaseEntity {
this.selectAftersalesNoticeVOList = selectAftersalesNoticeVOList;
}
public String getEnterpriseMaterialNo() {
return enterpriseMaterialNo;
}
public void setEnterpriseMaterialNo(String enterpriseMaterialNo) {
this.enterpriseMaterialNo = enterpriseMaterialNo;
}
@Override
public String toString() {
return Objects.toStringHelper(this)

10
ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
View File

@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="salesOrderType" column="sales_order_type" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="enterpriseMaterialNo" column="enterprise_material_no" />
<result property="commonCurrency" column="common_currency" />
<result property="customerPurser" column="customer_purser" />
<result property="materialSum" column="material_sum" />
@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
sales_order_id, use_status, audit_status, make_status, delivery_status,close_status,
sales_order_code, sales_order_number, sales_order_type,enterprise_code,customer_purser,
common_currency,enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice,
common_currency,enterprise_name,enterprise_material_no, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice,
rmbTaxSum,noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time,
delivery_conditions, delivery_method, delivery_address,delivery_phone,customer_delivery,
order_receiving_mode,order_receiving_time,customer_contact, contact_number,contact_email, contact_post,
@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSysSalesOrderList" parameterType="SysSalesOrderVo" resultMap="SysSalesOrderResult">
select s.sales_order_id, s.use_status, s.audit_status, s.make_status, s.delivery_status,
s.close_status, s.sales_order_code, s.sales_order_number, s.sales_order_type,s.enterprise_code,
s.customer_purser,s.common_currency,s.enterprise_name, s.material_sum, s.enterprise_sum,
s.customer_purser,s.common_currency,s.enterprise_name,s.enterprise_material_no, s.material_sum, s.enterprise_sum,
s.noRmbPrice, s.noRmbSum, s.rmbPrice, s.rmbTaxSum,s.noUsdPrice, s.noUsdSum, s.usdPrice, s.usdTaxSum,
s.payment_terms, s.delivery_time,s.delivery_conditions, s.delivery_method, s.delivery_address,s.delivery_phone,
s.customer_delivery,s.order_receiving_mode,s.order_receiving_time,s.customer_contact, s.contact_number,s.contact_email, s.contact_post,
@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesOrderNumber != null and salesOrderNumber != ''"> and s.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and s.enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and s.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enterpriseMaterialNo != null and enterpriseMaterialNo != ''"> and s.enterprise_material_no like concat('%', #{enterpriseMaterialNo}, '%')</if>
<if test="customerContact != null and customerContact != ''"> and s.customer_contact = #{customerContact}</if>
<if test="contactNumber != null and contactNumber != ''"> and s.contact_number = #{contactNumber}</if>
<if test="businessMembers != null and businessMembers != ''"> and s.business_members = #{businessMembers}</if>
@ -147,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesOrderType !=null">sales_order_type,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="enterpriseMaterialNo != null">enterprise_material_no,</if>
<if test="customerPurser !=null">customer_purser,</if>
<if test="commonCurrency !=null">common_currency,</if>
<if test="materialSum != null">material_sum,</if>
@ -207,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesOrderType !=null">#{salesOrderType},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="enterpriseMaterialNo != null">#{enterpriseMaterialNo},</if>
<if test="customerPurser !=null">#{customerPurser},</if>
<if test="commonCurrency !=null">#{commonCurrency},</if>
<if test="materialSum != null">#{materialSum},</if>
@ -271,6 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="customerPurser !=null">customer_purser = #{customerPurser},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name =#{enterpriseName},</if>
<if test="enterpriseMaterialNo != null">enterprise_material_no =#{enterpriseMaterialNo},</if>
<if test="materialSum != null">material_sum = #{materialSum},</if>
<if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
@ -338,6 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="customerPurser !=null">customer_purser = #{customerPurser},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name =#{enterpriseName},</if>
<if test="enterpriseMaterialNo != null">enterprise_material_no =#{enterpriseMaterialNo},</if>
<if test="materialSum != null">material_sum = #{materialSum},</if>
<if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>

Write Preview
Loading…
Cancel
Save