出入库界面显示调整，没用的去掉

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

@@ -14,6 +14,7 @@ import com.ruoyi.ams.order.form.AllocationForm;
 import com.ruoyi.ams.order.form.CancelOrderForm;
 import com.ruoyi.ams.order.form.InvTallyForm;
 import com.ruoyi.ams.order.service.IWmsDocOrderDetailsService;
+import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.service.IBaseIdsequenceService;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.framework.web.domain.server.Sys;
@@ -179,6 +180,7 @@ public class WmsDocOrderHeaderController extends BaseController {
     @PostMapping("/addDocOrderDetails")
     public AjaxResult addDocOrderDetails(@RequestBody WmsDocOrderDetails wmsDocOrderDetails) {
         LoginUser loginUser = getLoginUser();
+        wmsDocOrderDetails.setCustomerId(Constant.CUSTOMER_ID);
         wmsDocOrderDetails.setCreateBy(loginUser.getUsername());
         wmsDocOrderDetails.setCreateTime(new Date());
         return toAjax(wmsDocOrderHeaderService.insertWmsDocOrderDetails(wmsDocOrderDetails));

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

@@ -33,36 +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="expectedQty">
-            <el-input v-model="dataForm.expectedQty" placeholder="" type="number"></el-input>
-          </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-row>
       <el-row>
         <!--<el-col :span="8">
@@ -70,6 +65,11 @@
             <el-input v-model="dataForm.receivedQty" placeholder="" type="number"></el-input>
           </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>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="备注" prop="notes">
             <el-input v-model="dataForm.notes" placeholder=""></el-input>

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

@@ -37,18 +37,18 @@
               </el-select>
             </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="客户" 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="客户单号" prop="customerNo">
               <el-input v-model="dataFormHead.customerNo" placeholder=""></el-input>
@@ -68,20 +68,18 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="供应商" prop="supplierId">
-              <el-select v-model="dataFormHead.supplierId" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="item in supplierCombo"
-                  :key="item.value"
-                  :label="item.supplierName"
-                  :value="item.supplierId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="供应商" prop="supplierId">-->
+<!--              <el-select v-model="dataFormHead.supplierId" placeholder="请选择" style="width: 100%" clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in supplierCombo"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.supplierName"-->
+<!--                  :value="item.supplierId">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
             <el-form-item label="备注" prop="notes">
               <el-input v-model="dataFormHead.notes" placeholder=""></el-input>

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

@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="ERP单号" prop="asnReference1">
+        <el-input
+          v-model="queryParams.asnReference1"
+          placeholder="请输入ERP单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="入库类型" prop="asnType">
         <el-select v-model="queryParams.asnType" placeholder="请选择入库类型" clearable size="small">
           <el-option
@@ -30,23 +39,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="ERP单号" prop="asnReference1">
-        <el-input
-          v-model="queryParams.asnReference1"
-          placeholder="请输入ERP单号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预期到货时间" prop="expectedArriveTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.expectedArriveTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择预期到货时间">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item label="预期到货时间" prop="expectedArriveTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.expectedArriveTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择预期到货时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -117,11 +117,11 @@
 <!--      <el-table-column label="客户单号" align="center" prop="customerNo" />-->
       <el-table-column label="ERP单号" align="center" prop="asnReference1" />
       <!--<el-table-column label="asn参考信息" align="center" prop="asnReference2" />-->
-      <el-table-column label="预期到货时间" align="center" prop="expectedArriveTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.expectedArriveTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="预期到货时间" align="center" prop="expectedArriveTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.expectedArriveTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

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

@@ -3,7 +3,7 @@
     :title="!dataForm.id ? '明细新增' : '明细修改'"
     :close-on-click-modal="false"
     :modal="false"
-    :width="'70%'"
+    :width="'50%'"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
              label-width="80px">
@@ -13,18 +13,18 @@
             <el-input v-model="dataForm.orderNo" :disabled="true" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="客户" prop="customerId">
-            <el-select v-model="dataForm.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="8">-->
+<!--          <el-form-item label="客户" prop="customerId">-->
+<!--            <el-select v-model="dataForm.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="8">
           <el-form-item label="单据状态" prop="orderStatus">
             <el-select v-model="dataForm.lineStatus" :disabled="true" placeholder="请选择" style="width: 100%">
@@ -37,8 +37,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="物料" prop="sku">
             <el-input v-model="dataForm.sku" placeholder="">
@@ -46,37 +44,39 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="指定库区" prop="pickZone">
-            <el-select v-model="dataForm.pickZone" @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="location">
-            <el-select v-model="dataForm.location" 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="qtyOrdered">
             <el-input v-model="dataForm.qtyOrdered" placeholder=""></el-input>
           </el-form-item>
         </el-col>
       </el-row>
+
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="指定库区" prop="pickZone">-->
+<!--            <el-select v-model="dataForm.pickZone" @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="location">-->
+<!--            <el-select v-model="dataForm.location" 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>-->
+
       <div style="cursor: pointer;" @click="showHidden">
         <el-divider content-position="center">批次属性信息...</el-divider>
       </div>

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

@@ -37,15 +37,15 @@
               </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="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>

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

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="出库单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入出库单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="ERP单号" prop="soReference1">
         <el-input
           v-model="queryParams.soReference1"
@@ -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"

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

@@ -153,6 +153,7 @@
     <select id="selectWmsDocOrderHeaderList" parameterType="WmsDocOrderHeader" resultMap="WmsDocOrderHeaderResult">
         <include refid="selectWmsDocOrderHeaderVo"/>
         <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
             <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="soReference1 != null  and soReference1 != ''"> and so_reference1 like concat('%', #{soReference1}, '%')</if>