合并master分支代码

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

@@ -1,24 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="起始点位" prop="locationFrom">
+      <el-form-item label="任务编号" prop="taskNo">
         <el-input
-          v-model="queryParams.locationFrom"
-          placeholder="请输入起始点位"
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="起始区域" prop="areaFrom">
+        <!--        <el-input-->
+        <!--          v-model="queryParams.areaFrom"-->
+        <!--          placeholder="请输入起始区域"-->
+        <!--          clearable-->
+        <!--          size="small"-->
+        <!--          @keyup.enter.native="handleQuery"-->
+        <!--        />-->
+        <el-select v-model="queryParams.areaFrom" @change="locationZoneFromChange" 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-form-item label="起始点位" prop="locationFrom">
         <el-input
-          v-model="queryParams.areaFrom"
-          placeholder="请输入起始区域"
+          v-model="queryParams.locationFrom"
+          placeholder="请输入起始点位"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="终点点位" prop="locationTo">
         <el-input
           v-model="queryParams.locationTo"
@@ -29,65 +51,86 @@
         />
       </el-form-item>
       <el-form-item label="终点区域" prop="areaTo">
-        <el-input
-          v-model="queryParams.areaTo"
-          placeholder="请输入终点区域"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <!--        <el-input-->
+        <!--          v-model="queryParams.areaTo"-->
+        <!--          placeholder="请输入终点区域"-->
+        <!--          clearable-->
+        <!--          size="small"-->
+        <!--          @keyup.enter.native="handleQuery"-->
+        <!--        />-->
+        <el-select v-model="queryParams.areaTo" @change="locationZoneToChange" 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-form-item label="ִ状态" prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="请输入ִ状态"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUser">
-        <el-input
-          v-model="queryParams.createUser"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+<!--        <el-input-->
+<!--          v-model="queryParams.state"-->
+<!--          placeholder="请输入ִ状态"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+        <el-select v-model="queryParams.state" clearable placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
+      <!--      <el-form-item label="创建人" prop="createUser">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.createUser"-->
+      <!--          placeholder="请输入创建人"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="创建时间" prop="createDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.createDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="仓库" prop="shopId">
-        <el-input
-          v-model="queryParams.shopId"
-          placeholder="请输入仓库"
-          clearable
+        <el-date-picker
+          v-model="dateRange"
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
-      <!--<el-form-item label="任务开始时间" prop="startTime">-->
-        <!--<el-date-picker clearable size="small"-->
-          <!--v-model="queryParams.startTime"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择任务开始时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="任务结束时间" prop="endTime">-->
-        <!--<el-date-picker clearable size="small"-->
-          <!--v-model="queryParams.endTime"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择任务结束时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
+      <!--      <el-form-item label="仓库" prop="shopId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.shopId"-->
+      <!--          placeholder="请输入仓库"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+<!--      <el-form-item label="任务开始时间" prop="startTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.startTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="选择任务开始时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="任务结束时间" prop="endTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.endTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="选择任务结束时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -105,6 +148,15 @@
           v-hasPermi="['ams:wcsTask:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleCharge"
+        >充电任务</el-button>
+      </el-col>
       <!--<el-col :span="1.5">
         <el-button
           type="success"
@@ -116,17 +168,17 @@
           v-hasPermi="['ams:wcsTask:edit']"
         >修改</el-button>
       </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleCancel"
-          v-hasPermi="['ams:wcsTask:remove']"
-        >删除</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleCancel()"-->
+      <!--          v-hasPermi="['ams:wcsTask:remove']"-->
+      <!--        >取消任务</el-button>-->
+      <!--      </el-col>-->
       <!--<el-col :span="1.5">
         <el-button
           type="warning"
@@ -146,11 +198,12 @@
       <!--<el-table-column label="仓库" align="center" prop="shopId" />-->
       <!--<el-table-column label="调用系统名称" align="center" prop="sysName" />-->
       <!--<el-table-column label="调用设备名称" align="center" prop="deviceName" />-->
-      <el-table-column label="起始点位" align="center" prop="locationFrom" />
       <el-table-column label="起始区域" align="center" prop="areaFrom" />
+      <el-table-column label="起始点位" align="center" prop="locationFrom" />
       <el-table-column label="终点点位" align="center" prop="locationTo" />
+      <el-table-column label="AGV站点" align="center" prop="agvStation" />
       <el-table-column label="终点区域" align="center" prop="areaTo" />
-      <el-table-column label="优先级" align="center" prop="priority" />
+      <!--      <el-table-column label="优先级" align="center" prop="priority" />-->
       <el-table-column label="ִ状态" align="center" prop="state" >
         <template slot-scope="scope">
           <div v-if="scope.row.state === 1">开始</div>
@@ -169,7 +222,7 @@
           <div v-if="scope.row.state === 14">卸货待确认</div>
         </template>
       </el-table-column>
-      <!--<el-table-column label="备注" align="center" prop="remark" />-->
+      <el-table-column label="备注" align="center" prop="remark" />
       <!--<el-table-column label="创建人" align="center" prop="createUser" />-->
       <el-table-column label="创建时间" align="center" prop="createDate" width="200"/>
       <!--<el-table-column label="任务类型" align="center" prop="taskType" />-->
@@ -193,8 +246,8 @@
             @click="handleCancel(scope.row)"
             v-hasPermi="['ams:wcsTask:remove']"
           >取消</el-button>
-<!--          <el-button size="mini" type="text" v-if="scope.row.state === 7" @click="handleDisposition(scope.row, 'disFrom')">归于起点</el-button>-->
-<!--          <el-button size="mini" type="text" v-if="scope.row.state === 7" @click="handleDisposition(scope.row, 'disTo')">归于终点</el-button>-->
+          <!--          <el-button size="mini" type="text" v-if="scope.row.state === 7" @click="handleDisposition(scope.row, 'disFrom')">归于起点</el-button>-->
+          <!--          <el-button size="mini" type="text" v-if="scope.row.state === 7" @click="handleDisposition(scope.row, 'disTo')">归于终点</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -368,11 +421,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!--充电-->
+    <el-dialog :title="title" :visible.sync="chaegeOpen" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车号" prop="businessType">
+          <el-select v-model="form.agvNo" placeholder="请选择车辆" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in chargeCombo"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitChargeForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listWcsTask, getWcsTask, delWcsTask, addWcsTask, updateWcsTask, addTestTask , completeWcsTask, taskCancel, invDisposition } from "@/api/ams/wcsTask";
+import {
+  listWcsTask,
+  getWcsTask,
+  delWcsTask,
+  addWcsTask,
+  updateWcsTask,
+  addTestTask,
+  completeWcsTask,
+  taskCancel,
+  invDisposition,
+  addChargeTask
+} from "@/api/ams/wcsTask";
 import { queryLocationDict } from "@/api/base/locationInfo";
 import { queryLocationZoneDict } from "@/api/base/locationZone"
 
@@ -380,6 +463,8 @@ export default {
   name: "WcsTask",
   data() {
     return {
+      //创建时间范围
+      dateRange: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -398,6 +483,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 充电弹窗
+      chaegeOpen:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -415,7 +502,7 @@ export default {
         startTime: null,
         endTime: null,
         parentTask: null,
-        agvNo: null,
+        agvNo: null
       },
       // 表单参数
       form: {},
@@ -425,13 +512,61 @@ export default {
       businessTypeCombo: [
         {'label':'普通任务','value':'01'}
       ],
+      chargeCombo: [
+        {'label':'迷你堆垛A','value':'1'},
+        {'label':'迷你堆垛B','value':'2'},
+        {'label':'三向车','value':'3'}
+      ],
       taskTypeCombo: [
         {'label':'是','value':'Y'},
         {'label':'否','value':'N'}
       ],
       locationFromCombo: [],
       locationToCombo: [],
-      locationZoneCombo: []
+      locationZoneCombo: [],
+     options: [{//状态栏下拉选项
+       value: '1',
+       label: '开始'
+     }, {
+       value: '2',
+       label: '完成'
+     }, {
+       value: '3',
+       label: '开始取货'
+     }, {
+       value: '4',
+       label: '取货完成'
+     }, {
+       value: '5',
+       label: '开始卸货'
+     },{
+       value: '6',
+       label: '卸货完成'
+     },{
+       value: '7',
+       label: '取消'
+     },{
+       value: '8',
+       label: '异常'
+     },{
+       value: '9',
+       label: '待下发'
+     },{
+       value: '10',
+       label: '已下发'
+     },{
+       value: '11',
+       label: '取消并归于起点'
+     },{
+       value: '12',
+       label: '取消并归于终点'
+     },{
+       value: '13',
+       label: '取货待确认'
+     },{
+       value: '14',
+       label: '卸货待确认'
+     }],
     };
   },
   created() {
@@ -447,7 +582,7 @@ export default {
     /** 查询AGV任务列表 */
     getList() {
       this.loading = true;
-      listWcsTask(this.queryParams).then(response => {
+      listWcsTask(/*this.queryParams,*/this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.wcsTaskList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -523,6 +658,12 @@ export default {
       this.open = true;
       this.title = "添加AGV任务";
     },
+    /** 新增充电任务 */
+    handleCharge() {
+      this.reset();
+      this.chaegeOpen = true;
+      this.title = "添加充电任务";
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -547,6 +688,20 @@ export default {
         }
       });
     },
+    /** 提交按钮 */
+    submitChargeForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          addChargeTask(this.form).then(
+            response => {
+              this.getList();
+              this.$modal.msgSuccess("添加成功");
+              this.open = false;
+            }
+          );
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const taskNos = row.taskNo || this.ids;

ruoyi-ui/src/views/base/locationInfo/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable size="small" style="width: 100%">
-          <el-option
-            v-for="dict in this.warehouseCombo"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId">-->
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable size="small" style="width: 100%">-->
+<!--          <el-option-->
+<!--            v-for="dict in this.warehouseCombo"-->
+<!--            :key="dict.warehouseId"-->
+<!--            :label="dict.warehouseName"-->
+<!--            :value="dict.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="库区" prop="zoneId">
         <el-select v-model="queryParams.zoneId" placeholder="请选择库区" clearable size="small" style="width: 100%">
           <el-option
@@ -21,6 +21,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="库位id" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入库位编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="库位编码" prop="locationNo">
         <el-input
           v-model="queryParams.locationNo"
@@ -30,6 +39,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="AGV站点" prop="agvStation">
+        <el-input
+          v-model="queryParams.agvStation"
+          placeholder="请输入AGV站点"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="库位状态" prop="stockStatus">
         <el-select v-model="queryParams.stockStatus" placeholder="请选择库位状态" clearable size="small">
           <el-option
@@ -124,19 +142,11 @@
 
     <el-table v-loading="loading" :data="locationInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="库位id" align="center" prop="id" />
 <!--      <el-table-column label="仓库" align="center" prop="warehouseId" />-->
-      <el-table-column label="区域" align="center" prop="zoneId" />
+      <el-table-column label="区域" align="center" prop="zoneName" />
       <el-table-column label="库位编码" align="center" prop="locationNo" width="200"/>
       <el-table-column label="AGV站点" align="center" prop="agvStation" />
-      <el-table-column label="排号" align="center" prop="rowNo" />
-      <el-table-column label="排序号" align="center" prop="rowIndex" />
-      <el-table-column label="列号" align="center" prop="colNo" />
-      <el-table-column label="列序号" align="center" prop="colIndex" />
-      <el-table-column label="层号" align="center" prop="shiftNo" />
-      <el-table-column label="层序号" align="center" prop="shiftIndex" />
-      <el-table-column label="限高" align="center" prop="heightLimit" />
-      <el-table-column label="限重" align="center" prop="weightLimit" />
       <el-table-column label="库位状态" align="center" prop="stockStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.location_status" :value="scope.row.stockStatus"/>
@@ -147,11 +157,19 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isEmpty"/>
         </template>
       </el-table-column>
-      <!--<el-table-column label="储位类型" align="center" prop="locationType">-->
-        <!--<template slot-scope="scope">-->
-          <!--<dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
+      <el-table-column label="储位类型" align="center" prop="locationType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="排号" align="center" prop="rowNo" />
+      <el-table-column label="排序号" align="center" prop="rowIndex" />
+      <el-table-column label="列号" align="center" prop="colNo" />
+      <el-table-column label="列序号" align="center" prop="colIndex" />
+      <el-table-column label="层号" align="center" prop="shiftNo" />
+      <el-table-column label="层序号" align="center" prop="shiftIndex" />
+      <el-table-column label="限高" align="center" prop="heightLimit" />
+      <el-table-column label="限重" align="center" prop="weightLimit" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -394,7 +412,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         warehouseId: null,
+        id : null,
         zoneId: null,
+        zoneName: null,
         locationNo: null,
         stockStatus: null,
         isEmpty: null,
@@ -485,6 +505,7 @@ export default {
         id: null,
         warehouseId: null,
         zoneId: null,
+        zoneName: null,
         locationNo: null,
         locationBarcode: null,
         rowNo: null,

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

@@ -105,10 +105,20 @@
         </template>
       </el-table-column>
       <el-table-column label="分配数量" align="center" prop="qty" />
-      <el-table-column label="lotnum" align="center" prop="lotnum" />
       <el-table-column label="拣货数量" align="center" prop="pickQty" />
       <el-table-column label="已拣库位" align="center" prop="pickToLocation" />
       <el-table-column label="拣货事务" align="center" prop="pickTransactionId" />
+      <el-table-column label="批号" align="center" prop="lotatt01" />
+<!--      <el-table-column label="重量" align="center" prop="lotatt02" />-->
+<!--      <el-table-column label="生产日期" align="center" prop="lotatt03" />-->
+<!--      <el-table-column label="有效期" align="center" prop="lotatt04" />-->
+      <el-table-column label="质量状态" align="center" prop="lotatt05" />
+<!--      <el-table-column label="供应商" align="center" prop="lotatt06" />-->
+<!--      <el-table-column label="托盘号" align="center" prop="lotatt07" />-->
+      <el-table-column label="入库单号" align="center" prop="lotatt08" />
+<!--      <el-table-column label="拣货事务" align="center" prop="lotatt09" />-->
+<!--      <el-table-column label="拣货事务" align="center" prop="lotatt10" />-->
+      <el-table-column label="lotnum" align="center" prop="lotnum" />
       <!--<el-table-column label="待检库位" align="center" prop="locationId" />
       <el-table-column label="叫料待检事务id" align="center" prop="callTransactionId" />-->
       <el-table-column label="创建时间" align="center" prop="createDate" width="180">

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/ActAllocationDetails.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 分配查询对象 act_allocation_details
- * 
+ *
  * @author ruoyi
  * @date 2022-10-31
  */
@@ -79,174 +79,337 @@ public class ActAllocationDetails extends BaseEntity
     @Excel(name = "")
     private String userdefine4;
 
-    public void setAllocationId(String allocationId) 
+    private String lotatt01;
+    private String lotatt02;
+    private String lotatt03;
+    private String lotatt04;
+    private String lotatt05;
+    private String lotatt06;
+    private String lotatt07;
+    private String lotatt08;
+    private String lotatt09;
+    private String lotatt10;
+    private String lotatt11;
+    private String lotatt12;
+    private String lotatt13;
+    private String lotatt14;
+    private String lotatt15;
+    private String lotatt16;
+    private String lotatt17;
+    private String lotatt18;
+
+    public void setAllocationId(String allocationId)
     {
         this.allocationId = allocationId;
     }
 
-    public String getAllocationId() 
+    public String getAllocationId()
     {
         return allocationId;
     }
-    public void setOrderNo(String orderNo) 
+    public void setOrderNo(String orderNo)
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo() 
+    public String getOrderNo()
     {
         return orderNo;
     }
-    public void setLineNo(Long lineNo) 
+    public void setLineNo(Long lineNo)
     {
         this.lineNo = lineNo;
     }
 
-    public Long getLineNo() 
+    public Long getLineNo()
     {
         return lineNo;
     }
-    public void setMaterial(String material) 
+    public void setMaterial(String material)
     {
         this.material = material;
     }
 
-    public String getMaterial() 
+    public String getMaterial()
     {
         return material;
     }
-    public void setLocationId(Long locationId) 
+    public void setLocationId(Long locationId)
     {
         this.locationId = locationId;
     }
 
-    public Long getLocationId() 
+    public Long getLocationId()
     {
         return locationId;
     }
-    public void setCallTransactionId(String callTransactionId) 
+    public void setCallTransactionId(String callTransactionId)
     {
         this.callTransactionId = callTransactionId;
     }
 
-    public String getCallTransactionId() 
+    public String getCallTransactionId()
     {
         return callTransactionId;
     }
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
-    public void setLotnum(String lotnum) 
+    public void setLotnum(String lotnum)
     {
         this.lotnum = lotnum;
     }
 
-    public String getLotnum() 
+    public String getLotnum()
     {
         return lotnum;
     }
-    public void setQty(BigDecimal qty) 
+    public void setQty(BigDecimal qty)
     {
         this.qty = qty;
     }
 
-    public BigDecimal getQty() 
+    public BigDecimal getQty()
     {
         return qty;
     }
-    public void setPickTransactionId(String pickTransactionId) 
+    public void setPickTransactionId(String pickTransactionId)
     {
         this.pickTransactionId = pickTransactionId;
     }
 
-    public String getPickTransactionId() 
+    public String getPickTransactionId()
     {
         return pickTransactionId;
     }
-    public void setPickToLocation(String pickToLocation) 
+    public void setPickToLocation(String pickToLocation)
     {
         this.pickToLocation = pickToLocation;
     }
 
-    public String getPickToLocation() 
+    public String getPickToLocation()
     {
         return pickToLocation;
     }
-    public void setPickQty(BigDecimal pickQty) 
+    public void setPickQty(BigDecimal pickQty)
     {
         this.pickQty = pickQty;
     }
 
-    public BigDecimal getPickQty() 
+    public BigDecimal getPickQty()
     {
         return pickQty;
     }
-    public void setUserdefine1(String userdefine1) 
+    public void setUserdefine1(String userdefine1)
     {
         this.userdefine1 = userdefine1;
     }
 
-    public String getUserdefine1() 
+    public String getUserdefine1()
     {
         return userdefine1;
     }
-    public void setUserdefine2(String userdefine2) 
+    public void setUserdefine2(String userdefine2)
     {
         this.userdefine2 = userdefine2;
     }
 
-    public String getUserdefine2() 
+    public String getUserdefine2()
     {
         return userdefine2;
     }
-    public void setUserdefine3(String userdefine3) 
+    public void setUserdefine3(String userdefine3)
     {
         this.userdefine3 = userdefine3;
     }
 
-    public String getUserdefine3() 
+    public String getUserdefine3()
     {
         return userdefine3;
     }
-    public void setUserdefine4(String userdefine4) 
+    public void setUserdefine4(String userdefine4)
     {
         this.userdefine4 = userdefine4;
     }
 
-    public String getUserdefine4() 
+    public String getUserdefine4()
     {
         return userdefine4;
     }
 
+    public String getLotatt01() {
+        return lotatt01;
+    }
+
+    public void setLotatt01(String lotatt01) {
+        this.lotatt01 = lotatt01;
+    }
+
+    public String getLotatt02() {
+        return lotatt02;
+    }
+
+    public void setLotatt02(String lotatt02) {
+        this.lotatt02 = lotatt02;
+    }
+
+    public String getLotatt03() {
+        return lotatt03;
+    }
+
+    public void setLotatt03(String lotatt03) {
+        this.lotatt03 = lotatt03;
+    }
+
+    public String getLotatt04() {
+        return lotatt04;
+    }
+
+    public void setLotatt04(String lotatt04) {
+        this.lotatt04 = lotatt04;
+    }
+
+    public String getLotatt05() {
+        return lotatt05;
+    }
+
+    public void setLotatt05(String lotatt05) {
+        this.lotatt05 = lotatt05;
+    }
+
+    public String getLotatt06() {
+        return lotatt06;
+    }
+
+    public void setLotatt06(String lotatt06) {
+        this.lotatt06 = lotatt06;
+    }
+
+    public String getLotatt07() {
+        return lotatt07;
+    }
+
+    public void setLotatt07(String lotatt07) {
+        this.lotatt07 = lotatt07;
+    }
+
+    public String getLotatt08() {
+        return lotatt08;
+    }
+
+    public void setLotatt08(String lotatt08) {
+        this.lotatt08 = lotatt08;
+    }
+
+    public String getLotatt09() {
+        return lotatt09;
+    }
+
+    public void setLotatt09(String lotatt09) {
+        this.lotatt09 = lotatt09;
+    }
+
+    public String getLotatt10() {
+        return lotatt10;
+    }
+
+    public void setLotatt10(String lotatt10) {
+        this.lotatt10 = lotatt10;
+    }
+
+    public String getLotatt11() {
+        return lotatt11;
+    }
+
+    public void setLotatt11(String lotatt11) {
+        this.lotatt11 = lotatt11;
+    }
+
+    public String getLotatt12() {
+        return lotatt12;
+    }
+
+    public void setLotatt12(String lotatt12) {
+        this.lotatt12 = lotatt12;
+    }
+
+    public String getLotatt13() {
+        return lotatt13;
+    }
+
+    public void setLotatt13(String lotatt13) {
+        this.lotatt13 = lotatt13;
+    }
+
+    public String getLotatt14() {
+        return lotatt14;
+    }
+
+    public void setLotatt14(String lotatt14) {
+        this.lotatt14 = lotatt14;
+    }
+
+    public String getLotatt15() {
+        return lotatt15;
+    }
+
+    public void setLotatt15(String lotatt15) {
+        this.lotatt15 = lotatt15;
+    }
+
+    public String getLotatt16() {
+        return lotatt16;
+    }
+
+    public void setLotatt16(String lotatt16) {
+        this.lotatt16 = lotatt16;
+    }
+
+    public String getLotatt17() {
+        return lotatt17;
+    }
+
+    public void setLotatt17(String lotatt17) {
+        this.lotatt17 = lotatt17;
+    }
+
+    public String getLotatt18() {
+        return lotatt18;
+    }
+
+    public void setLotatt18(String lotatt18) {
+        this.lotatt18 = lotatt18;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("allocationId", getAllocationId())
-            .append("orderNo", getOrderNo())
-            .append("lineNo", getLineNo())
-            .append("material", getMaterial())
-            .append("locationId", getLocationId())
-            .append("callTransactionId", getCallTransactionId())
-            .append("status", getStatus())
-            .append("lotnum", getLotnum())
-            .append("qty", getQty())
-            .append("pickTransactionId", getPickTransactionId())
-            .append("pickToLocation", getPickToLocation())
-            .append("pickQty", getPickQty())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("userdefine1", getUserdefine1())
-            .append("userdefine2", getUserdefine2())
-            .append("userdefine3", getUserdefine3())
-            .append("userdefine4", getUserdefine4())
-            .toString();
+                .append("allocationId", getAllocationId())
+                .append("orderNo", getOrderNo())
+                .append("lineNo", getLineNo())
+                .append("material", getMaterial())
+                .append("locationId", getLocationId())
+                .append("callTransactionId", getCallTransactionId())
+                .append("status", getStatus())
+                .append("lotnum", getLotnum())
+                .append("qty", getQty())
+                .append("pickTransactionId", getPickTransactionId())
+                .append("pickToLocation", getPickToLocation())
+                .append("pickQty", getPickQty())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("userdefine1", getUserdefine1())
+                .append("userdefine2", getUserdefine2())
+                .append("userdefine3", getUserdefine3())
+                .append("userdefine4", getUserdefine4())
+                .toString();
     }
 }

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

@@ -111,25 +111,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWcsTaskListVO" parameterType="WcsTask" resultMap="WcsTaskResult">
         select t.task_no, t.business_type,bf.location_no location_from,fz.zone_name area_from,bt.location_no location_to,tz.zone_name area_to,
-        t.state,t.create_date,t.task_type, t.start_time, t.end_time
+        t.state,t.create_date,t.task_type, t.start_time, t.end_time,t.remark
         from wcs_task t
         left join base_location_info bf on t.location_from = bf.id
         left join base_location_info bt on t.location_to = bt.id
         left join base_location_zone fz on t.area_from = fz.zone_id
         left join base_location_zone tz on t.area_to = tz.zone_id
         <where>
-            <if test="locationFrom != null  and locationFrom != ''"> and t.location_from = #{locationFrom}</if>
+            <if test="locationFrom != null  and locationFrom != ''"> and bf.location_no like concat('%', #{locationFrom}, '%') </if>
+            <if test="taskNo != null  and taskNo != ''"> and t.task_no like concat('%', #{taskNo}, '%') </if>
             <if test="areaFrom != null  and areaFrom != ''"> and t.area_from = #{areaFrom}</if>
-            <if test="locationTo != null  and locationTo != ''"> and t.location_to = #{locationTo}</if>
+            <if test="locationTo != null  and locationTo != ''"> and bt.location_no like concat('%', #{locationTo}, '%')</if>
             <if test="areaTo != null  and areaTo != ''"> and t.area_to = #{areaTo}</if>
             <if test="priority != null "> and t.priority = #{priority}</if>
             <if test="state != null "> and t.state = #{state}</if>
             <if test="createUser != null  and createUser != ''"> and t.create_user = #{createUser}</if>
-            <if test="createDate != null "> and t.create_date = #{createDate}</if>
+            <!--            <if test="createDate != null "> and t.create_date = #{createDate}</if>-->
             <if test="taskType != null  and taskType != ''"> and t.task_type = #{taskType}</if>
             <if test="shopId != null  and shopId != ''"> and t.shop_id = #{shopId}</if>
-            <if test="startTime != null "> and t.start_time = #{startTime}</if>
-            <if test="endTime != null "> and t.end_time = #{endTime}</if>
+            <!--            <if test="startTime != null "> and t.start_time = #{startTime}</if>-->
+            <!--            <if test="endTime != null "> and t.end_time = #{endTime}</if>-->
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(t.create_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(t.create_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
             <if test="parentTask != null  and parentTask != ''"> and t.parent_task = #{parentTask}</if>
             <if test="agvNo != null  and agvNo != ''"> and t.agv_no like concat('%', #{agvNo}, '%')</if>
         </where>

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

@@ -25,6 +25,24 @@
         <result property="userdefine2" column="userdefine2"/>
         <result property="userdefine3" column="userdefine3"/>
         <result property="userdefine4" column="userdefine4"/>
+        <result property="lotatt01"    column="lotatt01"/>
+        <result property="lotatt02"    column="lotatt02"/>
+        <result property="lotatt03"    column="lotatt03"/>
+        <result property="lotatt04"    column="lotatt04"/>
+        <result property="lotatt05"    column="lotatt05"/>
+        <result property="lotatt06"    column="lotatt06"/>
+        <result property="lotatt07"    column="lotatt07"/>
+        <result property="lotatt08"    column="lotatt08"/>
+        <result property="lotatt09"    column="lotatt09"/>
+        <result property="lotatt10"    column="lotatt10"/>
+        <result property="lotatt11"    column="lotatt11"/>
+        <result property="lotatt12"    column="lotatt12"/>
+        <result property="lotatt13"    column="lotatt13"/>
+        <result property="lotatt14"    column="lotatt14"/>
+        <result property="lotatt15"    column="lotatt15"/>
+        <result property="lotatt16"    column="lotatt16"/>
+        <result property="lotatt17"    column="lotatt17"/>
+        <result property="lotatt18"    column="lotatt18"/>
     </resultMap>
 
     <sql id="selectActAllocationDetailsVo">
@@ -51,9 +69,13 @@
         from act_allocation_details
     </sql>
 
-    <select id="selectActAllocationDetailsList" parameterType="ActAllocationDetails"
-            resultMap="ActAllocationDetailsResult">
-        <include refid="selectActAllocationDetailsVo"/>
+    <select id="selectActAllocationDetailsList" parameterType="ActAllocationDetails" resultMap="ActAllocationDetailsResult">
+        select t1.*
+        ,t2.lotatt01,t2.lotatt02,t2.lotatt03,t2.lotatt04,t2.lotatt05,t2.lotatt06
+        ,t2.lotatt07,t2.lotatt08,t2.lotatt09,t2.lotatt10,t2.lotatt11,t2.lotatt12
+        ,t2.lotatt13,t2.lotatt14,t2.lotatt15,t2.lotatt16,t2.lotatt17,t2.lotatt18
+        from act_allocation_details t1
+        LEFT JOIN inv_lot_att t2 on t2.lotnum = t1.lotnum
         <where>
             <if test="allocationId != null  and allocationId != ''"> and allocation_id = #{allocationId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
@@ -181,4 +203,4 @@
     <update id="updateAllocationDetailsLocationIdByPalletNo">
         update act_allocation_details set location_id = #{locationId} where userdefine1 = #{palletNo}
     </update>
-</mapper>
+</mapper>

warewms-base/src/main/java/com/ruoyi/base/domain/BaseLocationInfo.java

@@ -27,6 +27,12 @@ public class BaseLocationInfo extends BaseEntity {
     @Excel(name = "区域id")
     private Long zoneId;
 
+    /**
+     * 区域id
+     */
+    @Excel(name = "库区名称")
+    private String zoneName;
+
     /**
      * 库位编码
      */
@@ -400,6 +406,13 @@ public class BaseLocationInfo extends BaseEntity {
         this.orderByClause = orderByClause;
     }
 
+    public String getZoneName() {
+        return zoneName;
+    }
+
+    public void setZoneName(String zoneName) {
+        this.zoneName = zoneName;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -40,6 +40,7 @@ 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="zoneName"    column="zone_name"    />
     </resultMap>
 
     <resultMap type="BaseLocationLotattVO" id="BaseLocationInfoLotattResult">
@@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lotattVO.lotatt16"    column="lotatt16"    />
         <result property="lotattVO.lotatt17"    column="lotatt17"    />
         <result property="lotattVO.lotatt18"    column="lotatt18"    />
+
     </resultMap>
 
     <resultMap type="lotattVO" id="LotattResult">
@@ -166,11 +168,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBaseLocationInfoList" parameterType="BaseLocationInfo" resultMap="BaseLocationInfoResult">
-        <include refid="selectBaseLocationInfoVo"/>
+        select t1.*,t2.zone_name
+        from base_location_info t1
+        left join base_location_zone t2 on t2.zone_id=t1.zone_id
         <where>
+            <if test="id != null "> and id like concat('%', #{id}, '%')</if>
             <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
-            <if test="zoneId != null "> and zone_id = #{zoneId}</if>
+            <if test="zoneId != null "> and t1.zone_id = #{zoneId}</if>
+            <if test="zoneName != null "> and zone_name = #{zoneName}</if>
             <if test="locationNo != null  and locationNo != ''"> and location_no like concat('%', #{locationNo}, '%')</if>
+            <if test="agvStation != null  and agvStation != ''"> and agv_station like concat('%', #{agvStation}, '%')</if>
             <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
             <if test="isEmpty != null  and isEmpty != ''"> and is_empty = #{isEmpty}</if>
             <if test="locationType != null  and locationType != ''"> and location_type = #{locationType}</if>