From 7b1a9aef6e23bf38d6b08f6756c79818bc200266 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 26 Nov 2025 19:58:08 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9APC=E7=BB=84=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupController.java           |  10 +-
 .../service/IMdMeMaterialbaseService.java     |  12 +-
 .../dao/mapper/MdMeMaterialbaseMapper.java    |  14 +
 .../dao/mapper/MdMeMaterialbaseMapper.xml     |  18 +
 .../impl/MdMeMaterialbaseServiceImpl.java     |  19 +-
 .../service/IMdPbGroupplateService.java       |   2 +-
 .../service/dao/GroupPlate.java               |   9 +
 .../service/dao/IOStorInvDis.java             |   5 +
 .../dao/mapper/MdPbGroupplateMapper.java      |   6 +-
 .../dao/mapper/MdPbGroupplateMapper.xml       |  14 +-
 .../impl/MdPbGroupplateServiceImpl.java       |  86 ++--
 .../views/wms/basedata/group/AddDialog.vue    | 184 +++++++++
 .../src/views/wms/basedata/group/AddDtl.vue   | 378 ++++++------------
 .../src/views/wms/basedata/group/index.vue    | 222 +---------
 .../src/views/wms/basedata/groupbag/index.vue | 357 +++++++++++++++++
 15 files changed, 807 insertions(+), 529 deletions(-)
 create mode 100644 wms/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
 create mode 100644 wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 3638e5b..1807cca 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -65,8 +65,7 @@ public class GroupController {
     @PostMapping("/checkVehicle")
     @Log("校验载具")
     public ResponseEntity<Object> checkVehicle(@RequestBody JSONObject whereJson) {
-        iMdPbGroupplateService.checkVehicle(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(iMdPbGroupplateService.checkVehicle(whereJson),HttpStatus.OK);
     }
 
     @PostMapping("/querySupp")
@@ -82,13 +81,6 @@ public class GroupController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @PostMapping("/copySave")
-    @Log("复制新增")
-    public ResponseEntity<Object> copySave(@RequestBody GroupPlate dto) {
-        iMdPbGroupplateService.create(dto);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @PostMapping("/printDelete")
     @Log("打印物料标签后删除")
     public ResponseEntity<Object> printDelete(@RequestBody GroupPlate dto) {
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java
index 0002f90..00bd787 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java
@@ -20,40 +20,46 @@ import java.util.Set;
 public interface IMdMeMaterialbaseService extends IService<MdMeMaterialbase> {
     /**
      * 分页查询
+     *
      * @param whereJson : {查询参数}
-     * @param pageable : 分页对象
+     * @param pageable  : 分页对象
      * @return 返回结果
      */
-    IPage<MdMeMaterialbase> queryAll(Map whereJson, PageQuery pageable);
+    IPage<JSONObject> queryAll(Map whereJson, PageQuery pageable);
 
     /**
      * 新增物料
+     *
      * @param dto 物料实体类
      */
     void create(MdMeMaterialbase dto);
 
     /**
      * 修改物料
+     *
      * @param dto 物料实体类
      */
     void update(MdMeMaterialbase dto);
 
     /**
      * 删除物料
+     *
      * @param ids 物料标识集合
      */
     void delete(Set<String> ids);
 
     /**
      * 物料同步
+     *
      * @param whereJson {
      *                  --
-     * }
+     *                  }
      */
     void materialSync(JSONObject whereJson);
 
     /**
      * 根据编码获取物料
+     *
      * @param material_code 物料编码
      * @return 返回结果
      */
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.java
index 2000dfa..b339bc7 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.java
@@ -1,8 +1,14 @@
 package org.nl.wms.basedata_manage.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.basedata_manage.service.dao.MdMeMaterialbase;
 
+import java.util.Map;
+
 /**
  * <p>
  * 物料基本信息表 Mapper 接口
@@ -13,4 +19,12 @@ import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
  */
 public interface MdMeMaterialbaseMapper extends BaseMapper<MdMeMaterialbase> {
 
+    /**
+     * 分页查询
+     *
+     * @param page      分页条件
+     * @param whereJson 查询条件
+     * @return IPage<JSONObject>
+     */
+    IPage<JSONObject> queryAllByPage(Page<JSONObject> page, @Param("param") Map whereJson);
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml
index b7c2bbe..ebaf685 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml
@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper">
 
+    <select id="queryAllByPage" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            mater.*,
+            class.class_name
+        FROM
+            md_me_materialbase mater
+            LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
+        <where>
+            1 = 1
+            <if test="param.search != null and param.search != ''">
+                AND
+                (mater.material_code LIKE #{param.search} or
+                 mater.material_name LIKE #{param.search})
+            </if>
+        </where>
+        ORDER BY mater.update_time Desc
+    </select>
+
 </mapper>
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
index 3078436..34beb69 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
@@ -1,10 +1,8 @@
 package org.nl.wms.basedata_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,20 +35,9 @@ import java.util.stream.Collectors;
 public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMapper, MdMeMaterialbase> implements IMdMeMaterialbaseService {
 
     @Override
-    public IPage<MdMeMaterialbase> queryAll(Map whereJson, PageQuery page) {
-        // 查询条件
-        LambdaQueryWrapper<MdMeMaterialbase> queryWrapper = new QueryWrapper<MdMeMaterialbase>().lambda();
-        String search = MapUtil.getStr(whereJson, "search");
-
-        if (ObjectUtil.isNotEmpty(search)) {
-            queryWrapper.likeRight(MdMeMaterialbase::getMaterial_code, search)
-                    .or(item -> item.likeRight(MdMeMaterialbase::getMaterial_name, search));
-        }
-        queryWrapper.orderByDesc(MdMeMaterialbase::getUpdate_time);
-
-        return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()),
-                queryWrapper
-        );
+    public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
+        return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
+                whereJson);
     }
 
     @Override
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
index 950b608..f3d9b15 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
@@ -62,7 +62,7 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
      *                  storagevehicle_code
      *                  }
      */
-    void checkVehicle(JSONObject whereJson);
+    List<JSONObject> checkVehicle(JSONObject whereJson);
 
     /**
      * 获取供应商信息
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
index 1b3afad..130604a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
@@ -1,11 +1,13 @@
 package org.nl.wms.warehouse_management.service.dao;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author Liuxy
@@ -87,4 +89,11 @@ public class GroupPlate implements Serializable {
      * 组盘时间
      */
     private String create_time;
+
+    /**
+     * 袋明细
+     */
+    @TableField(exist = false)
+    private List<GroupPlate> tableData;
+
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
index c45658e..a9683fb 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
@@ -93,6 +93,11 @@ public class IOStorInvDis implements Serializable {
      */
     private String storagevehicle_code;
 
+    /**
+     * 袋码
+     */
+    private String bag_code;
+
     /**
      * 是否已下发
      */
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java
index 4103040..91c66bb 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java
@@ -38,13 +38,13 @@ public interface MdPbGroupplateMapper extends BaseMapper<GroupPlate> {
     IPage<JSONObject> queryAllByPage(Page<JSONObject> page, @Param("param") Map whereJson);
 
     /**
-     * 手持小料箱公共查询
+     * 根据载具编码公共查询
      * @param whereJson {
-     *                  storagevehicle_code: 载具编码
+     *                  vahicle_code: 载具编码
      * }
      * @return List<JSONObject>
      */
-    List<JSONObject> pdaQueryGroupInfo(@Param("param") JSONObject whereJson);
+    List<JSONObject> queryVehicleGroupInfo(@Param("param") JSONObject whereJson);
 
     /**
      * 手持通用功能公共查询
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml
index 3f5e0d8..06c26a3 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml
@@ -50,6 +50,11 @@
                 late.vehicle_code LIKE #{param.storagevehicle_code}
             </if>
 
+            <if test="param.bag_code != null and param.bag_code != ''">
+                AND
+                late.bag_code LIKE #{param.bag_code}
+            </if>
+
             <if test="param.status != null and param.status != ''">
                 AND
                 late.status = #{param.status}
@@ -58,25 +63,24 @@
         ORDER BY late.create_time Desc
     </select>
 
-    <select id="pdaQueryGroupInfo" resultType="com.alibaba.fastjson.JSONObject">
+    <select id="queryVehicleGroupInfo" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             late.*,
             mater.material_code,
             mater.material_name,
             mater.material_spec,
             mater.material_model,
-            mater.quality_time AS quality_time_day,
             supp.supp_name
         FROM
             md_pb_groupplate late
             INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id
             INNER JOIN md_cs_supplierbase supp ON supp.supp_code = late.supp_code
         <where>
-            late.status = '1'
+            1 = 1
 
-            <if test="param.storagevehicle_code != null and param.storagevehicle_code != ''">
+            <if test="param.vehicle_code != null and param.vehicle_code != ''">
                 AND
-                late.storagevehicle_code = #{param.storagevehicle_code}
+                late.vehicle_code = #{param.vehicle_code}
             </if>
         </where>
 
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
index 509e341..774419a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -77,32 +78,53 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
     @Override
     @Transactional
     public void create(GroupPlate dto) {
-        // 校验载具信息
-        MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(dto.getVehicle_code());
-        if (ObjectUtil.isEmpty(vehicleDao.getWeigth())) {
-            throw new BadRequestException("请先维护载具重量信息!");
-        }
+        // 校验是组盘还是组袋
+        List<GroupPlate> tableData = dto.getTableData();
+        if (ObjectUtil.isEmpty(tableData)) {
+            // 组袋
+            dto.setGroup_id(IdUtil.getStringId());
+            // 计量单位默认重量KG
+            MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode("KG");
+            dto.setQty_unit_id(unitDao.getMeasure_unit_id());
+            dto.setQty_unit_name(unitDao.getUnit_name());
+            // 状态默认组盘
+            dto.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("生成"));
+            dto.setCreate_id(SecurityUtils.getCurrentUserId());
+            dto.setCreate_name(SecurityUtils.getCurrentNickName());
+            dto.setCreate_time(DateUtil.now());
+            this.save(dto);
+        } else {
+            // 组盘
+            String vehicle_code = dto.getVehicle_code();
+            if (ObjectUtil.isEmpty(vehicle_code)) {
+                throw new BadRequestException("托盘不能为空");
+            }
 
-        // 校验此载具是否已经组盘
-        List<GroupPlate> groupList = this.list(
-                new QueryWrapper<GroupPlate>().lambda()
-                        .eq(GroupPlate::getVehicle_code, dto.getVehicle_code())
-        );
-        if (ObjectUtil.isNotEmpty(groupList)) {
-            throw new BadRequestException("当前载具已经组盘【" + dto.getVehicle_code() + "】");
-        }
+            // 校验原料组盘时必须物料相同
+            boolean is_yl = tableData.stream()
+                    .anyMatch(row -> row.getBag_code().contains("YL"));
+            if (is_yl) {
+                GroupPlate groupPlate = tableData.get(0);
+                boolean is_like = tableData.stream()
+                        .allMatch(row -> row.getMaterial_id().equals(groupPlate.getMaterial_id()));
+            }
+            if (!is_yl) {
+                throw new BadRequestException("原料组盘物料必须相同！");
+            }
 
-        dto.setGroup_id(IdUtil.getStringId());
-        // 计量单位默认重量KG
-        MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode("KG");
-        dto.setQty_unit_id(unitDao.getMeasure_unit_id());
-        dto.setQty_unit_name(unitDao.getUnit_name());
-        // 状态默认组盘
-        dto.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘"));
-        dto.setCreate_id(SecurityUtils.getCurrentUserId());
-        dto.setCreate_name(SecurityUtils.getCurrentNickName());
-        dto.setCreate_time(DateUtil.now());
-        this.save(dto);
+            List<GroupPlate> createList = tableData.stream()
+                    .filter(row -> row.getStatus().equals(IOSEnum.GROUP_PLATE_STATUS.code("生成")))
+                    .collect(Collectors.toList());
+
+            for (GroupPlate dao : createList) {
+                dao.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘"));
+                dao.setVehicle_code(vehicle_code);
+                dao.setCreate_id(SecurityUtils.getCurrentUserId());
+                dao.setCreate_name(SecurityUtils.getCurrentNickName());
+                dao.setCreate_time(DateUtil.now());
+            }
+            this.updateBatchById(createList);
+        }
     }
 
     @Override
@@ -117,11 +139,21 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
     }
 
     @Override
-    public void checkVehicle(JSONObject whereJson) {
-        MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("storagevehicle_code"));
+    public List<JSONObject>  checkVehicle(JSONObject whereJson) {
+        MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("vehicle_code"));
         if (ObjectUtil.isEmpty(vehicleDao)) {
-            throw new BadRequestException("此载具不存在【" + whereJson.getString("storagevehicle_code") + "】");
+            throw new BadRequestException("此载具不存在【" + whereJson.getString("vehicle_code") + "】");
         }
+        // 校验此载具下的组盘信息是否有入库或者出库的信息
+        List<JSONObject> groupList = this.baseMapper.queryVehicleGroupInfo(whereJson);
+        boolean is_all = groupList.stream()
+                .allMatch(row -> row.getString("status").equals(IOSEnum.GROUP_PLATE_STATUS.code("生成"))
+                        || row.getString("status").equals(IOSEnum.GROUP_PLATE_STATUS.code("组盘"))
+                );
+        if (!is_all) {
+            throw new BadRequestException("当前载具【" + whereJson.getString("vehicle_code") + "】已经入库");
+        }
+        return groupList;
     }
 
     @Override
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue b/wms/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
new file mode 100644
index 0000000..c03dff4
--- /dev/null
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
@@ -0,0 +1,184 @@
+<template>
+  <el-dialog
+    title="组盘"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="载具编码" prop="vehicle_code">
+        <el-input v-model.trim="form.vehicle_code" @blur="checkVehicle" style="width: 210px" />
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span">袋明细</span>
+      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
+
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加袋信息
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column prop="bag_code" label="袋码" :min-width="flexWidth('bag_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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',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="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
+      <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" :disabled="scope.row.status !== '0'" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import AddDtl from '@/views/wms/basedata/group/AddDtl'
+import crudGroup from '@/views/wms/basedata/group/group'
+
+const defaultForm = {
+  group_id: null,
+  vehicle_code: null,
+  bag_code: null,
+  material_id: null,
+  pcsn: null,
+  qty_unit_id: null,
+  qty_unit_name: null,
+  qty: null,
+  remark: null,
+  status: null,
+  supp_code: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  material_spec: null,
+  material_name: null,
+  tableData: []
+}
+export default {
+  name: 'AddDialog',
+  components: { AddDtl },
+  mixins: [crud(), form(defaultForm)],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['GROUP_STATUS'],
+  data() {
+    return {
+      dialogVisible: false,
+      dtlShow: false,
+      rules: {
+        vehicle_code: [
+          { required: true, message: '载具不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('AddChanged')
+    },
+    queryDtl() {
+      if (!this.form.vehicle_code) {
+        this.crud.notify('请先输入载具编码', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.dtlShow = true
+    },
+    formattStatus(row) {
+      return this.dict.label.GROUP_STATUS[row.status]
+    },
+    checkVehicle() {
+      crudGroup.checkVehicle({ 'vehicle_code': this.form.vehicle_code }).then(res => {
+        this.form.tableData = res
+      })
+    },
+    tableChanged(rows) {
+      rows.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          var flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].bag_code === item.bag_code) {
+              flagnow = true
+            }
+          }
+        }
+        if (!flagnow) {
+          this.form.tableData.push(item)
+        }
+      })
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+</style>
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue b/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue
index b1a4767..3987d33 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue
@@ -1,292 +1,168 @@
 <template>
   <el-dialog
-    title="复制组盘"
+    title="袋信息选择"
     append-to-body
     :visible.sync="dialogVisible"
-    :before-close="handleClose"
-    width="1100px"
     destroy-on-close
+    width="1000px"
     @close="close"
     @open="open"
   >
-    <el-form ref="form2" :model="formMst" :rules="rules" size="mini" label-width="130px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="formMst.material_code" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="物料名称" prop="material_name">
-            <el-input v-model="formMst.material_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="物料规格" prop="material_spec">
-            <el-input v-model="formMst.material_spec" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="formMst.vehicle_code" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="焊材批号" prop="pcsn">
-            <el-input v-model="formMst.pcsn" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="物料重量" prop="qty">
-            <el-input-number v-model="formMst.qty" :precision="2" :controls="false" :min="1" style="width: 200px" />
-
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="供应商" prop="supp_code">
-            <el-select
-              v-model="formMst.supp_code"
-              disabled
-              size="mini"
-              style="width: 200px;"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in suppList"
-                :label="item.supp_name"
-                :value="item.supp_code"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="有效日期" prop="quality_time">
-            <el-date-picker v-model="formMst.quality_time" type="date" disabled placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="生产日期" prop="produce_time">
-            <el-date-picker v-model="formMst.produce_time" type="date" disabled placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="烘干次数" prop="bake_num">
-            <el-input-number v-model="formMst.bake_num" :precision="0" disabled :controls="false" :min="0" :max="3" style="width: 200px" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="品质类型" prop="quality_type">
-            <el-select
-              v-model="formMst.quality_type"
-              disabled
-              size="mini"
-              style="width: 200px;"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.QUALITY_TYPE"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="料箱类型" prop="box_type">
-            <el-select
-              v-model="formMst.box_type"
-              disabled
-              size="mini"
-              style="width: 200px;"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.storagevehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="执行标准" prop="execution_stand">
-            <el-input v-model="formMst.execution_stand" style="width: 380px;" disabled rows="2" type="textarea" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model="formMst.remark" style="width: 380px;" rows="2" type="textarea" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <!-- 搜索 -->
+    <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.bag_code"
+          clearable
+          size="mini"
+          placeholder="袋码"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
     </el-form>
-
-    <el-row :gutter="18">
-      <el-col :span="18" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="6">
-        <span>
-          <el-button icon="el-icon-check" size="mini" type="primary" @click="copySave">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-    <el-row :gutter="18">
-      <el-col :span="18" style="border: 10px solid white">
-        <span />
-      </el-col>
-    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="bag_code" label="袋码" :min-width="flexWidth('bag_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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',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="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
+      <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>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
 
-import CRUD, { crud } from '@crud/crud'
-import crudGroup from '@/views/wms/basedata/group/group'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
 
 export default {
-  name: 'WeighDialog',
-  mixins: [crud()],
-  dicts: ['storagevehicle_type', 'QUALITY_TYPE'],
+  name: 'AddDtl',
+  dicts: ['GROUP_STATUS'],
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '袋信息',
+      optShow: {},
+      url: 'api/group',
+      idField: 'group_id',
+      sort: 'group_id,desc'
+    })
+  },
+  mixins: [presenter(), header()],
   props: {
     dialogShow: {
       type: Boolean,
       default: false
-    },
-    openParam: {
-      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      checkrow: {},
+      rows: []
     }
   },
   watch: {
     dialogShow: {
       handler(newValue, oldValue) {
         this.dialogVisible = newValue
-        this.formMst = this.openParam
-        this.formMst.vehicle_code = ''
-        this.formMst.pcsn = null
-        this.formMst.qty = 1
       }
-    }
-  },
-  data() {
-    return {
-      formMst: {
-        group_id: null,
-        vehicle_code: null,
-        material_id: null,
-        pcsn: null,
-        qty_unit_id: null,
-        qty_unit_name: null,
-        qty: null,
-        remark: null,
-        status: null,
-        supp_code: null,
-        quality_time: null,
-        produce_time: new Date(),
-        execution_stand: null,
-        bake_num: null,
-        quality_type: '1',
-        box_type: null,
-        create_id: null,
-        create_name: null,
-        create_time: null,
-        material_spec: null,
-        material_name: null
-      },
-      suppList: [],
-      current: null,
-      dialogVisible: false,
-      rules: {
-        material_code: [
-          { required: true, message: '物料不能为空', trigger: 'blur' }
-        ],
-        vehicle_code: [
-          { required: true, message: '载具不能为空', trigger: 'blur' }
-        ],
-        supp_code: [
-          { required: true, message: '供应商不能为空', trigger: 'blur' }
-        ],
-        quality_time: [
-          { required: true, message: '有效日期不能为空', trigger: 'blur' }
-        ],
-        produce_time: [
-          { required: true, message: '生产日期不能为空', trigger: 'blur' }
-        ],
-        box_type: [
-          { required: true, message: '料箱类型不能为空', trigger: 'blur' }
-        ]
+    },
+    sectProp: {
+      handler(newValue, oldValue) {
+        this.defaultList = newValue
       }
     }
   },
   methods: {
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    close() {
-      this.$refs['form2'].resetFields()
-      this.$emit('update:dialogShow', false)
+    open() {
+      this.crud.query.status = '0'
       this.crud.toQuery()
     },
-    open() {
-      crudGroup.querySupp({}).then(row => {
-        this.suppList = row
-      })
+    formattStatus(row) {
+      return this.dict.label.GROUP_STATUS[row.status]
     },
-    copySave() {
-      if (this.formMst.vehicle_code === '') {
-        this.crud.notify('载具不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.checkrow = row
+      } else {
+        this.checkrow = row
+      }
+    },
+    /**
+     * 接受父组件传值
+     * @param msg
+     */
+    getMsg(msg) {
+      this.mol_type = msg
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.sects = null
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选')
         return
       }
-      this.formMst.bom_id = ''
-      this.formMst.out_type = ''
-      this.formMst.is_need_delete = ''
-      crudGroup.copySave(this.formMst).then(row => {
-        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.close()
-        this.crud.toQuery()
-      })
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
     }
   }
 }
 </script>
 
-<style>
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-  padding: 4px 4px;
-}
-.input-with-select  {
-  background-color: #fff;
-}
-
-</style>
diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
index ae09b04..6c5b3f0 100644
--- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
+++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue
@@ -59,17 +59,6 @@
       <rrOperation />
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="openAddDtl"
-        >
-          复制新增
-        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -82,146 +71,6 @@
           物料标签
         </el-button>
       </crudOperation>
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="1200px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" @change="queryMater" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="物料名称" prop="material_name">
-                <el-input v-model="form.material_name" disabled style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="物料规格" prop="material_spec">
-                <el-input v-model="form.material_spec" disabled style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="载具编码" prop="vehicle_code">
-                <el-input v-model="form.vehicle_code" :disabled="crud.status.edit > 0" @change="checkVehicle" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="焊材批号" prop="pcsn">
-                <el-input v-model="form.pcsn" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="物料重量" prop="qty">
-                <el-input-number v-model="form.qty" :precision="2" :controls="false" :min="1" style="width: 200px" />
-
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="供应商" prop="supp_code">
-                <el-select
-                  v-model="form.supp_code"
-                  clearable
-                  size="mini"
-                  style="width: 200px;"
-                  class="filter-item"
-                >
-                  <el-option
-                    v-for="item in suppList"
-                    :label="item.supp_name"
-                    :value="item.supp_code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="生产日期" prop="produce_time">
-                <el-date-picker v-model="form.produce_time" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="烘干次数" prop="bake_num">
-                <el-input-number v-model="form.bake_num" :precision="0" :controls="false" :min="0" :max="3" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="品质类型" prop="quality_type">
-                <el-select
-                  v-model="form.quality_type"
-                  size="mini"
-                  style="width: 200px;"
-                  class="filter-item"
-                  @change="crud.toQuery"
-                >
-                  <el-option
-                    v-for="item in dict.QUALITY_TYPE"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="料箱类型" prop="box_type">
-                <el-select
-                  v-model="form.box_type"
-                  size="mini"
-                  style="width: 200px;"
-                  class="filter-item"
-                  @change="crud.toQuery"
-                >
-                  <el-option
-                    v-for="item in dict.storagevehicle_type"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="执行标准" prop="execution_stand">
-                <el-input v-model="form.execution_stand" style="width: 380px;" rows="2" type="textarea" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="备注" prop="remark">
-                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-                <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -233,6 +82,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
+        <el-table-column prop="bag_code" label="袋码" :min-width="flexWidth('bag_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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
@@ -263,13 +113,13 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <AddDtl :dialog-show.sync="openAddDtlDialog" :open-param="openParam" />
+    <AddDialog @AddChanged="querytable" />
   </div>
 </template>
 
 <script>
 import crudGroup from '@/views/wms/basedata/group/group'
-import AddDtl from '@/views/wms/basedata/group/AddDtl'
+import AddDialog from '@/views/wms/basedata/group/AddDialog'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -277,33 +127,10 @@ import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  material_id: null,
-  pcsn: null,
-  qty_unit_id: null,
-  qty_unit_name: null,
-  qty: null,
-  remark: null,
-  status: null,
-  supp_code: null,
-  quality_time: null,
-  produce_time: new Date(),
-  execution_stand: null,
-  bake_num: null,
-  quality_type: '1',
-  box_type: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  material_spec: null,
-  material_name: null
-}
 export default {
   name: 'Group',
-  components: { pagination, crudOperation, rrOperation, udOperation, AddDtl },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog },
+  mixins: [presenter(), header(), form(), crud()],
   // 数据字典
   dicts: ['is_used', 'GROUP_STATUS', 'storagevehicle_type', 'QUALITY_TYPE'],
   cruds() {
@@ -326,35 +153,9 @@ export default {
     return {
       permission: {},
       openParam: {},
-      openAddDtlDialog: false,
-      suppList: [],
-      rules: {
-        material_code: [
-          { required: true, message: '物料不能为空', trigger: 'blur' }
-        ],
-        vehicle_code: [
-          { required: true, message: '载具不能为空', trigger: 'blur' }
-        ],
-        pcsn: [
-          { required: true, message: '批次不能为空', trigger: 'blur' }
-        ],
-        supp_code: [
-          { required: true, message: '供应商不能为空', trigger: 'blur' }
-        ],
-        produce_time: [
-          { required: true, message: '生产日期不能为空', trigger: 'blur' }
-        ],
-        box_type: [
-          { required: true, message: '料箱类型不能为空', trigger: 'blur' }
-        ]
-      }
+      openAddDtlDialog: false
     }
   },
-  created() {
-    crudGroup.querySupp({}).then(row => {
-      this.suppList = row
-    })
-  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
@@ -372,12 +173,6 @@ export default {
         this.form.material_id = ''
       })
     },
-    checkVehicle(value) {
-      crudGroup.checkVehicle({ 'vehicle_code': value }).then(row => {
-      }).catch(() => {
-        this.form.vehicle_code = ''
-      })
-    },
     formattStatus(row) {
       return this.dict.label.GROUP_STATUS[row.status]
     },
@@ -387,9 +182,8 @@ export default {
     formattQuality(row) {
       return this.dict.label.QUALITY_TYPE[row.quality_type]
     },
-    openAddDtl() {
-      this.openAddDtlDialog = true
-      this.openParam = this.$refs.table.selection[0]
+    querytable() {
+      this.crud.toQuery()
     },
     printTable() {
       let  row = this.$refs.table.selection[0]
diff --git a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue
new file mode 100644
index 0000000..9ebbe75
--- /dev/null
+++ b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue
@@ -0,0 +1,357 @@
+<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.bag_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-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="openAddDtl"
+        >
+          复制新增
+        </el-button>-->
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="printTable"
+        >
+          物料标签
+        </el-button>
+      </crudOperation>
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1200px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="物料编码" prop="material_code">
+                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" @change="queryMater" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="物料名称" prop="material_name">
+                <el-input v-model="form.material_name" disabled style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="物料规格" prop="material_spec">
+                <el-input v-model="form.material_spec" disabled style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="袋码" prop="bag_code">
+                <el-input v-model="form.bag_code" :disabled="crud.status.edit > 0" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="物料批号" prop="pcsn">
+                <el-input v-model="form.pcsn" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="物料重量" prop="qty">
+                <el-input-number v-model="form.qty" :precision="2" :controls="false" :min="1" style="width: 200px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="供应商" prop="supp_code">
+                <el-select
+                  v-model="form.supp_code"
+                  clearable
+                  size="mini"
+                  style="width: 200px;"
+                  class="filter-item"
+                >
+                  <el-option
+                    v-for="item in suppList"
+                    :label="item.supp_name"
+                    :value="item.supp_code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remark">
+                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+                <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <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="bag_code" label="袋码" :min-width="flexWidth('bag_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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',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="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
+        <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"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :disabled-edit="scope.row.status !== '0'"
+              :disabled-dle="scope.row.status !== '0'"
+              :data="scope.row"
+              :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'
+import { getLodop } from '@/assets/js/lodop/LodopFuncs'
+
+const defaultForm = {
+  group_id: null,
+  vehicle_code: null,
+  bag_code: null,
+  material_id: null,
+  pcsn: null,
+  qty_unit_id: null,
+  qty_unit_name: null,
+  qty: null,
+  remark: null,
+  status: null,
+  supp_code: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  material_spec: null,
+  material_name: null,
+  tableData: []
+}
+export default {
+  name: 'GroupBag',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['is_used', 'GROUP_STATUS', 'storagevehicle_type'],
+  cruds() {
+    return CRUD({
+      title: '组袋记录',
+      url: 'api/group',
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
+      idField: 'group_id',
+      sort: 'group_id,desc',
+      crudMethod: { ...crudGroup }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      openParam: {},
+      openAddDtlDialog: false,
+      suppList: [],
+      rules: {
+        material_code: [
+          { required: true, message: '物料不能为空', trigger: 'blur' }
+        ],
+        vehicle_code: [
+          { required: true, message: '载具不能为空', trigger: 'blur' }
+        ],
+        bag_code: [
+          { required: true, message: '袋码不能为空', trigger: 'blur' }
+        ],
+        pcsn: [
+          { required: true, message: '批次不能为空', trigger: 'blur' }
+        ],
+        supp_code: [
+          { required: true, message: '供应商不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    crudGroup.querySupp({}).then(row => {
+      this.suppList = row
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    queryMater(value) {
+      crudGroup.queryMater({ 'material_code': value }).then(row => {
+        this.form.material_spec = row.material_spec
+        this.form.material_name = row.material_name
+        this.form.material_id = row.material_id
+      }).catch(() => {
+        this.form.material_spec = ''
+        this.form.material_name = ''
+        this.form.material_code = ''
+        this.form.material_id = ''
+      })
+    },
+    formattStatus(row) {
+      return this.dict.label.GROUP_STATUS[row.status]
+    },
+    printTable() {
+      let  row = this.$refs.table.selection[0]
+      var bake_num = row.bake_num
+      if (row.out_type === '1004') {
+        bake_num += 1
+      }
+      const LODOP = getLodop()
+      LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+      // 打印纸张大小设置https://www.it610.com/article/2094844.html
+      LODOP.PRINT_INIT('')
+      LODOP.SET_PRINT_PAGESIZE(1, '100mm', '80mm', '')
+      LODOP.ADD_PRINT_RECT('1mm', '3mm', '94mm', '74mm', 0, 1)
+      LODOP.SET_PRINT_STYLE('FontSize', 11)
+      LODOP.SET_PRINT_STYLE('Bold', 1)
+      LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '40mm', '40mm', 'QRCode', row.material_code + '##' + row.material_name + '##' +
+      row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
+        row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
+      )
+      LODOP.ADD_PRINT_TEXT('7mm', '48mm', '80mm', '15mm', '物料编码：' + row.material_code + '')
+      LODOP.ADD_PRINT_TEXT('16mm', '48mm', '80mm', '15mm', '物料名称：' + row.material_name + '')
+      LODOP.ADD_PRINT_TEXT('25mm', '48mm', '80mm', '15mm', '规格：' + row.material_spec + '')
+      LODOP.ADD_PRINT_TEXT('34mm', '48mm', '80mm', '15mm', '型号：' + row.material_model + '')
+      LODOP.ADD_PRINT_TEXT('43mm', '48mm', '80mm', '15mm', '有效期(天)：' + row.quality_time_day + '')
+      LODOP.ADD_PRINT_TEXT('52mm', '48mm', '80mm', '15mm', '生产日期：' + row.produce_time + '')
+      LODOP.ADD_PRINT_TEXT('61mm', '48mm', '80mm', '15mm', '供应商名称：' + row.supp_name + '')
+
+      LODOP.ADD_PRINT_TEXT('43mm', '5mm', '80mm', '15mm', '烘干次数：' + bake_num + '')
+      LODOP.ADD_PRINT_TEXT('52mm', '5mm', '80mm', '15mm', '供应商编码：' + row.supp_code + '')
+      LODOP.ADD_PRINT_TEXT('61mm', '5mm', '80mm', '15mm', '批号：' + row.pcsn + '')
+      LODOP.ADD_PRINT_TEXT('69mm', '5mm', '80mm', '15mm', '执行标准：' + row.execution_stand + '')
+
+      // LODOP.PRINT()// 打印
+      LODOP.PREVIEW()// 预览
+
+      // 调用删除
+      if (row.out_type === '1004' && row.is_need_delete === '1') {
+        crudGroup.printDelete(row).then(res => {
+        })
+      }
+      this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>