箱型修改

op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoxDetail.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.op.common.core.annotation.Excel;
 import com.op.common.core.web.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 字典数据对象 mes_box_detail
  *
@@ -41,7 +43,7 @@ public class MesBoxDetail extends BaseEntity {
      * 箱型值
      */
     @Excel(name = "箱型值")
-    private String boxValue;
+    private BigDecimal boxValue;
 
     /**
      * 箱型类型
@@ -73,6 +75,10 @@ public class MesBoxDetail extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "状态（0正常")
     private String status;
 
+    private BigDecimal length;
+    private BigDecimal width;
+    private BigDecimal height;
+
     public void setBoxCode(Long boxCode) {
         this.boxCode = boxCode;
     }
@@ -106,11 +112,11 @@ public class MesBoxDetail extends BaseEntity {
         this.boxKey = boxKey;
     }
 
-    public void setBoxValue(String boxValue) {
+    public void setBoxValue(BigDecimal boxValue) {
         this.boxValue = boxValue;
     }
 
-    public String getBoxValue() {
+    public BigDecimal getBoxValue() {
         return boxValue;
     }
 
@@ -154,6 +160,30 @@ public class MesBoxDetail extends BaseEntity {
         return status;
     }
 
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    public BigDecimal getHeight() {
+        return height;
+    }
+
+    public void setHeight(BigDecimal height) {
+        this.height = height;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoxServiceImpl.java

@@ -119,6 +119,7 @@ public class MesBoxServiceImpl implements IMesBoxService {
     }
 
     @Override
+    @DS("#header.poolName")
     public boolean checkBoxTypeUnique(MesBox mesBox) {
         Long boxId = StringUtils.isNull(mesBox.getBoxId()) ? -1L : mesBox.getBoxId();
         MesBox boxType = mesBoxMapper.checkBoxTypeUnique(mesBox.getBoxType());

op-modules/op-mes/src/main/resources/mapper/mes/MesBoxDetailMapper.xml

@@ -20,15 +20,23 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="length" column="length"/>
+        <result property="width" column="width"/>
+        <result property="height" column="height"/>
     </resultMap>
 
     <sql id="selectMesBoxDetailVo">
-		select box_code, box_sort, box_label, box_key, box_value, box_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark from mes_box_detail
+		select box_code, box_sort, box_label, box_key,
+		       box_value, box_type, css_class, list_class,
+		       is_default, status, create_by, create_time,
+		       update_by, update_time, remark,
+		       length, width, height from mes_box_detail
 	</sql>
 
     <select id="selectMesBoxDetailList" parameterType="MesBoxDetail" resultMap="MesBoxDetailResult">
         <include refid="selectMesBoxDetailVo"/>
         <where>
+            del_flag = '0'
             <if test="boxSort != null ">
                 and box_sort = #{boxSort}
             </if>
@@ -99,6 +107,12 @@
             </if>
             <if test="remark != null">remark,
             </if>
+            <if test="length != null">length,
+            </if>
+            <if test="width != null">width,
+            </if>
+            <if test="height != null">height,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="boxCode != null">#{boxCode},
@@ -131,6 +145,12 @@
             </if>
             <if test="remark != null">#{remark},
             </if>
+            <if test="length != null">#{length},
+            </if>
+            <if test="width != null">#{width},
+            </if>
+            <if test="height != null">#{height},
+            </if>
         </trim>
     </insert>
 
@@ -179,16 +199,25 @@
             <if test="remark != null">remark =
                 #{remark},
             </if>
+            <if test="length != null">length =
+                #{length},
+            </if>
+            <if test="width != null">width =
+                #{width},
+            </if>
+            <if test="height != null">height =
+                #{height},
+            </if>
         </trim>
         where box_code = #{boxCode}
     </update>
 
     <delete id="deleteMesBoxDetailByBoxCode" parameterType="Long">
-		delete from mes_box_detail where box_code = #{boxCode}
+		update mes_box_detail set del_flag = '1' where box_code = #{boxCode}
 	</delete>
 
     <delete id="deleteMesBoxDetailByBoxCodes" parameterType="String">
-        delete from mes_box_detail where box_code in
+        update mes_box_detail set del_flag = '1' where box_code in
         <foreach item="boxCode" collection="array" open="(" separator="," close=")">
             #{boxCode}
         </foreach>

op-modules/op-mes/src/main/resources/mapper/mes/MesBoxMapper.xml

@@ -23,6 +23,7 @@
     <select id="selectMesBoxList" parameterType="MesBox" resultMap="MesBoxResult">
         <include refid="selectMesBoxVo"/>
         <where>
+            del_flag = '0'
             <if test="boxName != null  and boxName != ''">
                 and box_name like concat('%', #{boxName}, '%')
             </if>
@@ -33,7 +34,6 @@
                 and status = #{status}
             </if>
         </where>
-        where del_flag = '0'
     </select>
 
     <select id="selectMesBoxByBoxId" parameterType="Long"