提交

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/order/domain/Order.java

@@ -62,4 +62,19 @@ public class Order extends BaseEntity
     @ApiModelProperty("用料")
     @Size(max = 200, message = "用料长度不能超过200个字符")
     private String material;
+
+    @Excel(name = "装量")
+    @ApiModelProperty("装量")
+    @Min(value = 0, message = "装量不能小于0")
+    private BigDecimal contentNum;
+
+    @Excel(name = "包装大小")
+    @ApiModelProperty("包装大小")
+    @Size(max = 200, message = "包装大小长度不能超过200个字符")
+    private String packageSize;
+
+    @Excel(name = "名称")
+    @ApiModelProperty("名称")
+    private String name;
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml

@@ -20,7 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bo.deleted,
             bo.status,
             bo.order_date,
-            bo.material
+            bo.material,
+            bo.content_num,
+            bo.package_size,
+            bo.name
         from bst_order bo
     </sql>
 
@@ -36,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.material != null  and query.material != ''"> and bo.material like concat('%', #{query.material}, '%')</if>
         <if test="query.excludeId != null">and bo.id != #{query.excludeId}</if>
         <if test="query.eqOrderNo != null and query.eqOrderNo != ''">and bo.order_no = #{query.eqOrderNo}</if>
+        <if test="query.packageSize != null  and query.packageSize != ''"> and bo.package_size like concat('%', #{query.packageSize}, '%')</if>
+        <if test="query.name != null  and query.name != ''"> and bo.name like concat('%', #{query.name}, '%')</if>
         <if test="query.statusList != null and query.statusList.size() > 0">
             and bo.status in
             <foreach item="item" collection="query.statusList" open="(" separator="," close=")">
@@ -86,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">`status`,</if>
             <if test="orderDate != null">order_date,</if>
             <if test="material != null">material,</if>
+            <if test="contentNum != null">content_num,</if>
+            <if test="packageSize != null">package_size,</if>
+            <if test="name != null">`name`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null and orderNo != ''">#{orderNo},</if>
@@ -100,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">#{status},</if>
             <if test="orderDate != null">#{orderDate},</if>
             <if test="material != null">#{material},</if>
+            <if test="contentNum != null">#{contentNum},</if>
+            <if test="packageSize != null">#{packageSize},</if>
+            <if test="name != null">#{name},</if>
          </trim>
     </insert>
 
@@ -134,6 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.status != null and data.status != ''">`status` = #{data.status},</if>
         <if test="data.orderDate != null">order_date = #{data.orderDate},</if>
         <if test="data.material != null">material = #{data.material},</if>
+        <if test="data.contentNum != null">content_num = #{data.contentNum},</if>
+        <if test="data.packageSize != null">package_size = #{data.packageSize},</if>
+        <if test="data.name != null">`name` = #{data.name},</if>
     </sql>
 
     <delete id="deleteOrderById" parameterType="Long">

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java

@@ -47,6 +47,9 @@ public class OrderConverterImpl implements OrderConverter {
         bo.setOrderNo(data.getOrderNo());
         bo.setOrderDate(data.getOrderDate());
         bo.setMaterial(data.getMaterial());
+        bo.setContentNum(data.getContentNum());
+        bo.setPackageSize(data.getPackageSize());
+        bo.setName(data.getName());
         if (submit) {
             bo.setStatus(OrderStatus.RELEASED.getStatus());
         } else {
@@ -73,6 +76,9 @@ public class OrderConverterImpl implements OrderConverter {
         bo.setOrderNo(data.getOrderNo());
         bo.setOrderDate(data.getOrderDate());
         bo.setMaterial(data.getMaterial());
+        bo.setContentNum(data.getContentNum());
+        bo.setPackageSize(data.getPackageSize());
+        bo.setName(data.getName());
         if (submit) {
             bo.setStatus(OrderStatus.RELEASED.getStatus());
         }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/prodProcess/domain/ProdProcessVO.java

@@ -31,6 +31,12 @@ public class ProdProcessVO extends ProdProcess{
     @ApiModelProperty("订单日期")
     private LocalDate orderDate;
 
+    @ApiModelProperty("订单装量")
+    private BigDecimal orderContentNum;
+
+    @ApiModelProperty("订单包装大小")
+    private String orderPackageSize;
+
     @ApiModelProperty("客户")
     private String orderCustomer;
 

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/prodProcess/mapper/ProdProcessMapper.xml

@@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bo.create_by as order_create_by,
             bo.create_time as order_create_time,
             bo.num as order_num,
+            bo.content_num as order_content_num,
+            bo.package_size as order_package_size,
             sd.dept_name as dept_name
         from bst_prod_process bpp
             left join bst_order_prod bop on bop.id = bpp.order_prod_id