1.入库-入库管理-表头和明细:隐藏不必要的字段。

2.出库-出库单-表头和明细：隐藏不必要的字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/asn/WmsDocAsnHeaderController.java

@@ -142,7 +142,7 @@ public class WmsDocAsnHeaderController extends BaseController {
             docAsnHeader.setCreateTime(now);
             docAsnHeader.setUpdateTime(now);
             docAsnHeader.setUpdateBy(loginUser.getUsername());
-            docAsnHeader.setAsnType("PR");
+            docAsnHeader.setAsnType("");
             docAsnHeader.setAsnStatus("00");
             map.put("isAdd", true);
         } else {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/WmsDocOrderHeaderController.java

@@ -134,7 +134,7 @@ public class WmsDocOrderHeaderController extends BaseController {
             orderHeader.setOrderNo(orderNo);
             orderHeader.setCreateBy(loginUser.getUsername());
             orderHeader.setCreateTime(now);
-            orderHeader.setOrderType("OD");
+            orderHeader.setOrderType("");
             orderHeader.setOrderStatus("00");
             orderHeader.setCustomerId("");
             map.put("isAdd", true);

ruoyi-ui/src/views/wms/docAsn/docAsnDetails-add-or-update.vue

@@ -33,31 +33,31 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="指定区域" prop="locationZone">
-            <el-select v-model="dataForm.locationZone" @change="locationZoneChange" placeholder="请选择库区" clearable
-                       size="small" style="width: 100%">
-              <el-option
-                v-for="dict in this.locationZoneCombo"
-                :key="dict.zoneId"
-                :label="dict.zoneName"
-                :value="dict.zoneId"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="指定库位" prop="locationId">
-            <el-select v-model="dataForm.locationId" placeholder="请选择库位" clearable size="small" style="width: 100%">
-              <el-option
-                v-for="dict in locationCombo"
-                :key="dict.id"
-                :label="dict.locationNo"
-                :value="dict.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="指定区域" prop="locationZone">-->
+<!--            <el-select v-model="dataForm.locationZone" @change="locationZoneChange" placeholder="请选择库区" clearable-->
+<!--                       size="small" style="width: 100%">-->
+<!--              <el-option-->
+<!--                v-for="dict in this.locationZoneCombo"-->
+<!--                :key="dict.zoneId"-->
+<!--                :label="dict.zoneName"-->
+<!--                :value="dict.zoneId"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="指定库位" prop="locationId">-->
+<!--            <el-select v-model="dataForm.locationId" placeholder="请选择库位" clearable size="small" style="width: 100%">-->
+<!--              <el-option-->
+<!--                v-for="dict in locationCombo"-->
+<!--                :key="dict.id"-->
+<!--                :label="dict.locationNo"-->
+<!--                :value="dict.id"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="8">
           <el-form-item label="预期数量" prop="expectedQty">
             <el-input v-model="dataForm.expectedQty" placeholder="" type="number"></el-input>

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

@@ -9,7 +9,7 @@
              label-width="80px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="入库单号" prop="orderNo">
+          <el-form-item label="出库单号" prop="orderNo">
             <el-input v-model="dataForm.orderNo" :disabled="true" placeholder=""></el-input>
           </el-form-item>
         </el-col>

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

@@ -37,34 +37,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="发货时间" prop="shipmentTime">-->
+<!--              <el-date-picker-->
+<!--                v-model="dataFormHead.shipmentTime"-->
+<!--                type="date"-->
+<!--                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="客户" prop="customerId">-->
+<!--              <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in customerIdCombo"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.customerName"-->
+<!--                  :value="item.customerId">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="客户单号1" prop="soReference1">-->
+<!--              <el-input v-model="dataFormHead.soReference1" placeholder=""></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
-            <el-form-item label="发货时间" prop="shipmentTime">
-              <el-date-picker
-                v-model="dataFormHead.shipmentTime"
-                type="date"
-                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户" prop="customerId">
-              <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="item in customerIdCombo"
-                  :key="item.value"
-                  :label="item.customerName"
-                  :value="item.customerId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户单号1" prop="soReference1">
-              <el-input v-model="dataFormHead.soReference1" placeholder=""></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户单号2" prop="soReference2">
+            <el-form-item label="越库单号" prop="soReference2">
               <el-input v-model="dataFormHead.soReference2" placeholder=""></el-input>
             </el-form-item>
           </el-col>
@@ -100,7 +100,7 @@
         roleList: [],
         dataFormHead: {
           orderNo: '',
-          orderType: 'OD',
+          orderType: '',
           orderStatus: '',
           shipmentTime: '',
           soReference1: '',

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

@@ -1,10 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="客户" prop="customerId">
+<!--      <el-form-item label="客户" prop="customerId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.customerId"-->
+<!--          placeholder="请输入客户"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="出库单号" prop="orderNo">
         <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户"
+          v-model="queryParams.orderNo"
+          placeholder="请输入出库单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -30,14 +39,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="发货时间" prop="shipmentTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.shipmentTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="发货时间">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item label="发货时间" prop="shipmentTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.shipmentTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="发货时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -128,9 +137,9 @@
           <dict-tag :options="dict.type.so_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column label="客户单号1" align="center" prop="soReference1"/>
-      <el-table-column label="客户单号2" align="center" prop="soReference2"/>
-      <el-table-column label="客户单号3" align="center" prop="soReference3"/>
+<!--      <el-table-column label="客户单号1" align="center" prop="soReference1"/>-->
+      <el-table-column label="越库入库单号" align="center" prop="soReference2"/>
+<!--      <el-table-column label="客户单号3" align="center" prop="soReference3"/>-->
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="创建人" align="center" prop="createBy"/>
       <!--<el-table-column label="单据操作优先级" align="center" prop="priority" />-->
@@ -236,6 +245,7 @@ export default {
       dateRange: [],
       // 查询参数
       queryParams: {
+        orderNo:null,
         pageNum: 1,
         pageSize: 10,
         customerId: null,

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

@@ -155,6 +155,7 @@
         <where>
             <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>
         </where>
         order by create_time desc
     </select>
@@ -379,4 +380,4 @@
         and de.line_status = '20'
         group by de.order_no,w.box_no,b.location_no
     </select>
-</mapper>
+</mapper>