bug修复

ruoyi-ui/src/views/ams/flowConfig/index.vue

@@ -296,9 +296,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <!--<el-form-item label="对接设备" prop="locationToDevice">-->
-              <!--<el-input v-model="form.locationToDevice" placeholder="请输入终点是否对接设备" />-->
-            <!--</el-form-item>-->
             <el-form-item label="是否显示" prop="locationToFlag">
               <el-select style="width: 100%" v-model="form.locationToFlag" placeholder="是否显示" size="small">
                 <el-option
@@ -323,6 +320,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="关联流程" prop="">
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+          </el-col>
+        </el-row>
         <el-divider content-position="center">批次属性信息</el-divider>
         <el-table :data="flowConfigDetailsList" :row-class-name="rowFlowConfigDetailsIndex" @selection-change="handleFlowConfigDetailsSelectionChange" ref="flowConfigDetails">
           <el-table-column label="序号" align="center" prop="index" width="50"/>

ruoyi-ui/src/views/ams/inv/locationView/index.vue

@@ -31,7 +31,7 @@
     </el-row>
     <div style="overflow-scrolling: auto">
       <ul class="wall-row"
-          :style="{'width':(this.tableAttr.cols * 130)+'px', 'height':(this.tableAttr.rows * 80) + 'px'}">
+          :style="{'width':(this.tableAttr.cols * 145)+'px', 'height':(this.tableAttr.rows * 95) + 'px'}">
         <li
           v-for="(item, index) in divList"
           :key="index"
@@ -50,7 +50,7 @@
         </li>
       </ul>
     </div>
-    <el-dialog title="操作" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog title="操作" :visible.sync="open" width="1000px" append-to-body>
       <el-form>
         <el-form-item>
           <el-button type="primary" @click="lockLoc()">锁定/解锁</el-button>
@@ -252,6 +252,10 @@
     height: 80px;
     border: 0.5px solid #fff;
     float: left;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    margin-left: 5px;
   }
 
   .div {

warewms-ams/src/main/java/com/ruoyi/ams/config/domain/FlowConfigHeader.java

@@ -122,6 +122,10 @@ public class FlowConfigHeader extends BaseEntity {
 
     private String remark;
 
+    private String relFlow;
+
+    private String rootFlow;
+
     public String getLocationFromStrategyFlag() {
         return locationFromStrategyFlag;
     }
@@ -321,6 +325,22 @@ public class FlowConfigHeader extends BaseEntity {
         this.flowType = flowType;
     }
 
+    public String getRelFlow() {
+        return relFlow;
+    }
+
+    public void setRelFlow(String relFlow) {
+        this.relFlow = relFlow;
+    }
+
+    public String getRootFlow() {
+        return rootFlow;
+    }
+
+    public void setRootFlow(String rootFlow) {
+        this.rootFlow = rootFlow;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

warewms-ams/src/main/java/com/ruoyi/ams/config/domain/vo/FlowConfigHeaderVO.java

@@ -86,6 +86,10 @@ public class FlowConfigHeaderVO extends BaseEntity {
 
     private String locationToStrategyFlag;
 
+    private String relFlow;
+
+    private String rootFlow;
+
     /** 流程配置体信息 */
     private List<FlowConfigDetailsVO> flowConfigDetailsList;
 
@@ -290,6 +294,22 @@ public class FlowConfigHeaderVO extends BaseEntity {
         this.flowType = flowType;
     }
 
+    public String getRelFlow() {
+        return relFlow;
+    }
+
+    public void setRelFlow(String relFlow) {
+        this.relFlow = relFlow;
+    }
+
+    public String getRootFlow() {
+        return rootFlow;
+    }
+
+    public void setRootFlow(String rootFlow) {
+        this.rootFlow = rootFlow;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

warewms-ams/src/main/java/com/ruoyi/ams/config/domain/vo/FlowConfigVO.java

@@ -73,6 +73,10 @@ public class FlowConfigVO extends BaseEntity {
 
     private String locationToStrategyFlag;
 
+    private String relFlow;
+
+    private String rootFlow;
+
     /** 流程配置体信息 */
     private List<FlowConfigDetailsVO> flowConfigDetailsList;
 
@@ -259,4 +263,20 @@ public class FlowConfigVO extends BaseEntity {
     public void setFlowType(String flowType) {
         this.flowType = flowType;
     }
+
+    public String getRelFlow() {
+        return relFlow;
+    }
+
+    public void setRelFlow(String relFlow) {
+        this.relFlow = relFlow;
+    }
+
+    public String getRootFlow() {
+        return rootFlow;
+    }
+
+    public void setRootFlow(String rootFlow) {
+        this.rootFlow = rootFlow;
+    }
 }

warewms-ams/src/main/resources/mapper/ams/FlowConfigHeaderMapper.xml

@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="relFlow"    column="rel_flow"    />
+        <result property="rootFlow"    column="root_flow"    />
     </resultMap>
 
     <resultMap type="FlowConfigHeader" id="FlowConfigHeaderVOResult">
@@ -62,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="relFlow"    column="rel_flow"    />
+        <result property="rootFlow"    column="root_flow"    />
     </resultMap>
 
     <resultMap id="FlowConfigHeaderFlowConfigDetailsResult" type="flowConfigHeaderVO" extends="FlowConfigHeaderVOResult">
@@ -92,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFlowConfigHeaderVo">
-        select id, flow_name,flow_type, sku_type, sku_type_flag, qty, qty_flag, weight, weight_flag, supplier, supplier_flag, location_from,location_from_flag, location_from_device, location_to,location_to_flag, location_to_device, create_by, create_time, update_by, update_time, remark,location_from_strategy_flag ,location_to_strategy_flag   from flow_config_header
+        select id, flow_name,flow_type, sku_type, sku_type_flag, qty, qty_flag, weight, weight_flag, supplier, supplier_flag, location_from,location_from_flag, location_from_device, location_to,location_to_flag, location_to_device, create_by, create_time, update_by, update_time, remark,location_from_strategy_flag ,location_to_strategy_flag,rel_flow,root_flow  from flow_config_header
     </sql>
 
     <select id="selectFlowConfigHeaderList" parameterType="FlowConfigHeader" resultMap="FlowConfigHeaderResult">
@@ -112,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFlowConfigHeaderById" parameterType="Long" resultMap="FlowConfigHeaderFlowConfigDetailsResult">
         select a.id, a.flow_name,a.flow_type, a.sku_type, a.sku_type_flag, a.qty, a.qty_flag, a.weight, a.weight_flag, a.supplier, a.supplier_flag, a.location_from,a.location_from_flag, a.location_from_device, a.location_to,a.location_to_flag, a.location_to_device, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
         a.qty_range,a.weight_range,a.supplier_range,b.id as sub_id, b.header_id as sub_header_id, b.lotatt_id as sub_lotatt_id,cf.lotatt_name as sub_lotatt_name, b.lotatt_flag as sub_lotatt_flag, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
-        a.location_from_strategy_flag,a.location_to_strategy_flag
+        a.location_from_strategy_flag,a.location_to_strategy_flag,a.rel_flow,a.root_flow
         from flow_config_header a
         left join flow_config_details b on b.header_id = a.id
         left join lotatt_config cf on b.lotatt_id = cf.lotatt_id
@@ -148,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="relFlow != null">rel_flow,</if>
+            <if test="rootFlow != null">root_flow,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="flowName != null">#{flowName},</if>
@@ -176,6 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="relFlow != null">#{relFlow},</if>
+            <if test="rootFlow != null">#{rootFlow},</if>
          </trim>
     </insert>
 
@@ -205,6 +213,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="relFlow != null">rel_flow = #{relFlow},</if>
+            <if test="rootFlow != null">root_flow = #{rootFlow},</if>
         </trim>
         where id = #{id}
     </update>