add：组盘记录

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java

@@ -0,0 +1,48 @@
+package org.nl.wms.basedata_manage.controller;
+
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * <p>
+ * 组盘记录 控制层
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-06-03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/group")
+@Slf4j
+public class GroupController {
+
+    @Resource
+    private final IMdPbGroupplateService iMdPbGroupplateService;
+
+    @GetMapping
+    @Log("分页查询")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iMdPbGroupplateService.queryAll(whereJson, page)), HttpStatus.OK);
+    }
+
+    @DeleteMapping
+    @Log("删除组盘")
+    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
+        iMdPbGroupplateService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java

@@ -1,8 +1,14 @@
 package org.nl.wms.warehouse_management.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * <p>
  * 组盘记录表 服务类
@@ -13,4 +19,17 @@ import org.nl.wms.warehouse_management.service.dao.GroupPlate;
  */
 public interface IMdPbGroupplateService extends IService<GroupPlate> {
 
+    /**
+     * 分页查询
+     * @param whereJson : {查询参数}
+     * @param page : 分页对象
+     * @return 返回结果
+     */
+    IPage<JSONObject> queryAll(Map whereJson, PageQuery page);
+
+    /**
+     * 删除组盘
+     * @param ids 标识集合
+     */
+    void delete(Set<String> ids);
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java

@@ -2,10 +2,13 @@ package org.nl.wms.warehouse_management.service.dao.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,4 +27,12 @@ public interface MdPbGroupplateMapper extends BaseMapper<GroupPlate> {
      * }
      */
     List<JSONObject> getDtl(@Param("param") JSONObject whereJson);
+
+    /**
+     * 分页查询
+     * @param page 分页条件
+     * @param whereJson 查询条件
+     * @return IPage<StIvtMoveinv>
+     */
+    IPage<JSONObject> queryAllByPage(Page<JSONObject> page, @Param("param") Map whereJson);
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml

@@ -18,4 +18,38 @@
             </if>
         </where>
     </select>
+
+    <select id="queryAllByPage" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            late.*,
+            mater.material_code,
+            mater.material_name
+        FROM
+            md_pb_groupplate late
+            INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id
+        <where>
+            1 = 1
+            <if test="param.material_code != null and param.material_code != ''">
+                AND
+                (mater.material_code LIKE  #{param.material_code} or
+                 mater.material_name LIKE  #{param.material_code} )
+            </if>
+
+            <if test="param.pcsn != null and param.pcsn != ''">
+                AND
+                late.pcsn LIKE #{param.pcsn}
+            </if>
+
+            <if test="param.storagevehicle_code != null and param.storagevehicle_code != ''">
+                AND
+                late.storagevehicle_code LIKE #{param.storagevehicle_code}
+            </if>
+
+            <if test="param.status != null and param.status != ''">
+                AND
+                late.status = #{param.status}
+            </if>
+        </where>
+        ORDER BY late.create_time Desc
+    </select>
 </mapper>

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java

@@ -1,10 +1,18 @@
 package org.nl.wms.warehouse_management.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
 import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -17,4 +25,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper, GroupPlate> implements IMdPbGroupplateService {
 
+    @Override
+    public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
+        return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
+                whereJson);
+    }
+
+    @Override
+    @Transactional
+    public void delete(Set<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java

@@ -187,7 +187,7 @@ public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
         // 更新
         this.update(
                 new UpdateWrapper<IOStorInv>().lambda()
-                    .in(IOStorInv::getIo_type, idList)
+                    .in(IOStorInv::getIostorinv_id, idList)
                     .set(IOStorInv::getIs_upload, IOSConstant.IS_DELETE_YES)
                     .set(IOStorInv::getUpdate_optid, SecurityUtils.getCurrentUserId())
                     .set(IOStorInv::getUpdate_optname, SecurityUtils.getCurrentNickName())

wms/nladmin-ui/src/views/wms/basedata/group/group.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/group',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/group/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/group',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

wms/nladmin-ui/src/views/wms/basedata/group/index.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="物料查询">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              placeholder="物料编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="批次号">
+            <el-input
+              v-model="query.pcsn"
+              clearable
+              size="mini"
+              placeholder="批次"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="载具编码">
+            <el-input
+              v-model="query.storagevehicle_code"
+              clearable
+              size="mini"
+              placeholder="载具编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.GROUP_STATUS"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" />
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
+        <el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
+        <el-table-column prop="qty" label="组盘数量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_name" label="组盘人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
+        <el-table-column prop="create_time" label="组盘时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />
+        <el-table-column
+          v-permission="['admin','Supplierbase:edit','Supplierbase:del']"
+          label="操作"
+          width="150px"
+          lign="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :is-visiable-edit="false"
+              :disabled-dle="scope.row.status === '02'"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudGroup from '@/views/wms/basedata/group/group'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+
+const defaultForm = {
+  group_id: null,
+  storagevehicle_code: null,
+  material_id: null,
+  pcsn: null,
+  qty_unit_id: null,
+  qty_unit_name: null,
+  qty: null,
+  remark: null,
+  status: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  ext_code: null,
+  ext_type: null
+}
+export default {
+  name: 'Group',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['is_used', 'GROUP_STATUS'],
+  cruds() {
+    return CRUD({
+      title: '组盘记录',
+      url: 'api/group',
+      optShow: {
+        add: false,
+        reset: true
+      },
+      idField: 'group_id',
+      sort: 'group_id,desc',
+      crudMethod: { ...crudGroup }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      classes: [],
+      rules: {
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    formattStatus(row) {
+      return this.dict.label.GROUP_STATUS[row.status]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

wms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -174,16 +174,16 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
-        <el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')">
+        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')">
           <template slot-scope="scope">
             {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
+        <!--<el-table-column prop="vehicle_code2" label="载具编码2" :min-width="flexWidth('vehicle_code2',crud.data,'载具编码2')">
           <template slot-scope="scope">
             {{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
           </template>
-        </el-table-column>
+        </el-table-column>-->
 <!--        <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
         <el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')">
           <template slot-scope="scope">
@@ -193,10 +193,10 @@
         <el-table-column prop="remark" label="提示信息" :min-width="flexWidth('remark',crud.data,'提示信息')" />
         <el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
         <el-table-column prop="task_name" label="配置名称" :min-width="flexWidth('task_name',crud.data,'任务名称')" />
-        <el-table-column prop="point_code1" label="起点1" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
+        <el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
-        <el-table-column prop="point_code2" label="终点1" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
+        <el-table-column prop="point_code2" label="终点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
-        <el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
+       <!-- <el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
-        <el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />
+        <el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />-->
         <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -207,7 +207,7 @@
         <el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
         <el-table-column v-if="false" prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
         <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
-        <el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
+<!--        <el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />-->
         <el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
         <el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')">
           <template slot-scope="scope">
@@ -223,7 +223,7 @@
         <el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
         <el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
         <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
-        <el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />
+<!--        <el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />-->
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
@@ -313,6 +313,9 @@ export default {
         download: false,
         reset: true
       },
+      query: {
+        more_task_status: ['7'], task_status: ['7']
+      },
       crudMethod: { ...crudSchBaseTask }
     })
   },

wms/nladmin-ui/src/views/wms/sch/taskconfig/index.vue

@@ -279,11 +279,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')" />
-        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型', 20)" >
+       <!-- <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型', 20)" >
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
         <el-table-column prop="task_create_max_num" label="任务生成数上限" :min-width="flexWidth('task_create_max_num',crud.data,'任务生成数上限')" />
         <el-table-column prop="task_issue_max_num" label="任务下发数上限" :min-width="flexWidth('task_issue_max_num',crud.data,'任务下发数上限')" />