1.出库界面-新建出库单头可下拉框选择破袋机编号

ruoyi-ui/src/views/wms/docOrder/docOrderHeader-add-or-update.vue

@@ -37,7 +37,20 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="6">-->
+          <el-col :span="6">
+            <el-form-item label="破袋机编号" prop="soReference3">
+              <el-select v-model="dataFormHead.soReference3" placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.bbmId_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="6">-->
 <!--            <el-form-item label="发货时间" prop="shipmentTime">-->
 <!--              <el-date-picker-->
 <!--                v-model="dataFormHead.shipmentTime"-->
@@ -91,7 +104,7 @@
   import {queryCustomerDict} from "@/api/base/customer";
 
   export default {
-    dicts: ['so_status', 'so_type'],
+    dicts: ['so_status', 'so_type','bbmId_type'],
     data () {
       return {
         choseId: '',

ruoyi-ui/src/views/wms/docOrder/index.vue

@@ -39,7 +39,18 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="发货时间" prop="shipmentTime">-->
+      <el-form-item label="破袋机编号" prop="soReference3">
+        <el-select v-model="queryParams.soReference3" placeholder="请选择单据类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.bbmId_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <!--      <el-form-item label="发货时间" prop="shipmentTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--                        v-model="queryParams.shipmentTime"-->
 <!--                        type="date"-->
@@ -138,8 +149,13 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="客户单号1" align="center" prop="soReference1"/>-->
-      <el-table-column label="越库入库单号" align="center" prop="soReference2"/>
+      <el-table-column label="越库单号" align="center" prop="soReference2"/>
 <!--      <el-table-column label="客户单号3" align="center" prop="soReference3"/>-->
+      <el-table-column label="破袋机编号" align="center" prop="soReference3">
+      <template slot-scope="scope">
+        <dict-tag :options="dict.type.bbmId_type" :value="scope.row.soReference3"/>
+      </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="创建人" align="center" prop="createBy"/>
       <!--<el-table-column label="单据操作优先级" align="center" prop="priority" />-->
@@ -220,7 +236,7 @@ import {pushDocAsn} from "@/api/docAsn/docAsn";
 
 export default {
   name: "DocOrder",
-  dicts: ['so_status', 'so_type'],
+  dicts: ['so_status', 'so_type','bbmId_type'],
   data() {
     return {
       addOrUpdateVisible: false,

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -156,6 +156,7 @@
             <if test="consigneeName != null  and consigneeName != ''"> and consignee_name like concat('%', #{consigneeName}, '%')</if>
             <if test="carrierName != null  and carrierName != ''"> and carrier_name like concat('%', #{carrierName}, '%')</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="soReference3 != null  and soReference3 != ''"> and so_reference3 = #{soReference3}</if>
         </where>
         order by create_time desc
     </select>