add：拣选管理

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/WmsToAcsService.java

@@ -1,6 +1,7 @@
 package org.nl.wms.ext.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.ext.service.util.AcsResponse;
 import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 
@@ -22,4 +23,11 @@ public interface WmsToAcsService {
      * @return AcsResponse
      */
     AcsResponse renotifyAcs(List<AcsTaskDto> list);
+
+    /**
+     * 获取称重信息
+     * @param whereJson /
+     * @return AcsResponse
+     */
+    AcsResponse getWeighAcs(JSONObject whereJson);
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToAcsServiceImpl.java

@@ -1,5 +1,6 @@
 package org.nl.wms.ext.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.wms.ext.enums.EXTConstant;
 import org.nl.wms.ext.service.WmsToAcsService;
@@ -26,4 +27,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
     public AcsResponse renotifyAcs(List<AcsTaskDto> list) {
         return AcsUtil.notifyAcs(EXTConstant.SEND_TASK_ACS_API, list);
     }
+
+    @Override
+    public AcsResponse getWeighAcs(JSONObject whereJson) {
+        return null;
+    }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/util/AcsResponse.java

@@ -3,6 +3,7 @@ package org.nl.wms.ext.service.util;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import org.nl.wms.ext.util.BaseResponse;
 
@@ -13,9 +14,13 @@ import org.nl.wms.ext.util.BaseResponse;
  */
 @Data
 public class AcsResponse extends BaseResponse {
+
     private JSONArray errArr = new JSONArray();
+
     private JSONArray data = new JSONArray();
 
+    private JSONObject resultData = new JSONObject();
+
     /**
      * 请求失败
      * @param message 错误信息

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/SelectBackInTask.java

@@ -0,0 +1,201 @@
+package org.nl.wms.sch_manage.service.util.tasks;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.config.IdUtil;
+import org.nl.wms.basedata_manage.enums.BaseDataEnum;
+import org.nl.wms.sch_manage.enums.TaskEnum;
+import org.nl.wms.sch_manage.enums.TaskStatus;
+import org.nl.wms.sch_manage.service.ISchBaseTaskService;
+import org.nl.wms.sch_manage.service.dao.SchBaseTask;
+import org.nl.wms.sch_manage.service.util.AbstractTask;
+import org.nl.wms.sch_manage.service.util.AcsTaskDto;
+import org.nl.wms.sch_manage.service.util.TaskType;
+import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
+import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 拣选回库任务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-15
+ */
+@Component(value = "SelectBackInTask")
+@TaskType("SelectBackInTask")
+public class SelectBackInTask extends AbstractTask {
+    @Autowired
+    private ISchBaseTaskService taskService;
+
+    @Resource
+    private IRawAssistIStorService rawAssistIStorService;
+
+    @Resource
+    private IOStorInvDisMapper ioStorInvDisMapper;
+
+    @Resource
+    private IMdPbGroupplateService iMdPbGroupplateService;
+
+    @Override
+    public String create(JSONObject json) {
+        SchBaseTask task = new SchBaseTask();
+        task.setTask_id(IdUtil.getStringId());
+        task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
+        task.setTask_status(TaskStatus.CREATE.getCode());
+        task.setConfig_code(SelectBackInTask.class.getSimpleName());
+        task.setPoint_code1(json.getString("point_code1"));
+        task.setPoint_code2(json.getString("point_code2"));
+        task.setVehicle_code(json.getString("vehicle_code"));
+        task.setMaterial_id(json.getString("material_id"));
+        task.setMaterial_qty(json.getBigDecimal("material_qty"));
+        task.setGroup_id(json.getString("group_id"));
+        task.setRequest_param(json.toString());
+        task.setTask_type(TaskEnum.TASK_TYPE.code("料箱"));
+        task.setPriority(json.getString("Priority"));
+        task.setCreate_id(SecurityUtils.getCurrentUserId());
+        task.setCreate_name(SecurityUtils.getCurrentNickName());
+        task.setCreate_time(DateUtil.now());
+        taskService.save(task);
+
+        // 下发任务
+        this.sendTaskOne(task.getTask_id());
+        return task.getTask_id();
+    }
+
+    @Override
+    public AcsTaskDto sendAcsParam(String taskId) {
+        SchBaseTask taskDao = taskService.getById(taskId);
+
+        // 组织下发给acs的数据
+        AcsTaskDto acsTaskDto = new AcsTaskDto();
+        acsTaskDto.setExt_task_id(taskDao.getTask_id());
+        acsTaskDto.setTask_code(taskDao.getTask_code());
+        acsTaskDto.setStart_device_code(taskDao.getPoint_code1());
+        acsTaskDto.setNext_device_code(taskDao.getPoint_code2());
+        acsTaskDto.setPriority(taskDao.getPriority());
+        acsTaskDto.setVehicle_code(taskDao.getVehicle_code());
+        acsTaskDto.setTask_type("1");
+
+        return acsTaskDto;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj);
+        }
+
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        rawAssistIStorService.taskFinish(taskObj);
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark("已完成");
+        taskService.updateById(taskObj);
+        this.taskConfirm(task_code);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
+            throw new BadRequestException("任务状态必须为生成才能取消任务");
+        }
+        this.cancelTask(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj) {
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark("已完成");
+        taskService.updateById(taskObj);
+        rawAssistIStorService.taskFinish(taskObj);
+        this.taskConfirm(taskObj.getTask_code());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj) {
+        // 取消任务
+        taskService.update(new LambdaUpdateWrapper<SchBaseTask>()
+                .set(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("是"))
+                .set(SchBaseTask::getTask_status, TaskStatus.CANCELED.getCode())
+                .set(SchBaseTask::getRemark, "已取消")
+                .eq(SchBaseTask::getTask_id, taskObj.getTask_id())
+        );
+        //分配表清除任务
+        ioStorInvDisMapper.update(new IOStorInvDis(), new LambdaUpdateWrapper<>(IOStorInvDis.class)
+                .set(IOStorInvDis::getTask_id, null)
+                .set(IOStorInvDis::getPoint_code, null)
+                .set(IOStorInvDis::getIs_issued, 0)
+                .set(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("未生成"))
+                .eq(IOStorInvDis::getTask_id, taskObj.getTask_id())
+        );
+
+        // 更新任务状态
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark("已取消");
+        taskService.updateById(taskObj);
+    }
+
+    @Override
+    public void taskConfirm(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+
+        IOStorInvDis disDao = ioStorInvDisMapper.selectOne(
+                new QueryWrapper<IOStorInvDis>().lambda()
+                        .eq(IOStorInvDis::getTask_id, taskObj.getTask_id())
+        );
+        // 更新组盘信息
+        iMdPbGroupplateService.update(
+                new UpdateWrapper<GroupPlate>().lambda()
+                    .set(GroupPlate::getQty, disDao.getPlan_qty())
+                    .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+                    .eq(GroupPlate::getStoragevehicle_code, disDao.getStoragevehicle_code())
+                    .eq(GroupPlate::getPcsn, disDao.getPcsn())
+                    .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
+        );
+    }
+}

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/controller/SelectOutController.java

@@ -0,0 +1,68 @@
+package org.nl.wms.warehouse_management.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+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.SelectOutService;
+import org.nl.wms.warehouse_management.service.dto.SelectOutDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 拣选管理 控制层
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-18
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/SectOut")
+@Slf4j
+public class SelectOutController {
+
+    @Autowired
+    private SelectOutService selectOutService;
+
+    @GetMapping
+    @Log("分页查询")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(selectOutService.queryAll(whereJson, page)), HttpStatus.OK);
+    }
+
+    @PostMapping("/getSelectDis")
+    @Log("获取拣选批次")
+    public ResponseEntity<Object> getSelectDis(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(selectOutService.getSelectDis(whereJson),HttpStatus.OK);
+    }
+
+    @PostMapping("/getWeigh")
+    @Log("获取称重信息")
+    public ResponseEntity<Object> getWeigh(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(selectOutService.getWeigh(whereJson),HttpStatus.OK);
+    }
+
+    @PostMapping("/saveWeigh")
+    @Log("保存称重信息")
+    public ResponseEntity<Object> saveWeigh(@RequestBody SelectOutDto dto) {
+        selectOutService.saveWeigh(dto);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/confirmCheck")
+    @Log("确认拣选")
+    public ResponseEntity<Object> confirmCheck(@RequestBody SelectOutDto dto) {
+        selectOutService.confirmCheck(dto);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java

@@ -29,7 +29,7 @@ public enum IOSEnum {
 
     // 入库业务类型
     IN_BILL_TYPE(MapOf.of("收货入库","0001", "退料入库","0002" , "合箱入库","0003"
-            ,"拼箱入库", "0004" ,"手工入库", "0009"
+            ,"拼箱入库", "0004" ,"拣选回库", "0005", "手工入库", "0009"
     )),
 
     // 入库业务类型
@@ -39,7 +39,7 @@ public enum IOSEnum {
 
     // 入库任务配置类编码
     IN_CONFIG_CODE(MapOf.of("0001","DetainInTask", "0002", "BackInTask",
-            "0003", "GeBoxInTask", "0004", "PieceBoxInTask", "0009", "HandInTask"
+            "0003", "GeBoxInTask", "0004", "PieceBoxInTask", "0005", "SelectBackInTask", "0009", "HandInTask"
     )),
 
     // 出库任务配置类编码

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

@@ -0,0 +1,68 @@
+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.IOStorInvDtl;
+import org.nl.wms.warehouse_management.service.dto.SelectOutDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 拣选管理 服务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-18
+ */
+public interface SelectOutService extends IService<IOStorInvDtl> {
+
+    /**
+     * 分页查询
+     *
+     * @param whereJson : {查询参数}
+     * @param page      : 分页对象
+     * @return 返回结果
+     */
+    IPage<SelectOutDto> queryAll(Map whereJson, PageQuery page);
+
+    /**
+     * 获取拣选明细
+     *
+     * @param whereJson {
+     *                  出入库明细
+     *                  }
+     * @return List<JSONObject> 出入库分配明细
+     */
+    List<JSONObject> getSelectDis(JSONObject whereJson);
+
+    /**
+     * 获取拣选重量
+     *
+     * @param whereJson {
+     *                  分配明细信息
+     *                  }
+     * @return JSONObject {
+     * weigh_qty: 称重重量
+     * select_qty: 拣选重量
+     * }
+     */
+    JSONObject getWeigh(JSONObject whereJson);
+
+    /**
+     * 保存称重信息
+     *
+     * @param dto dto实体类
+     */
+    void saveWeigh(SelectOutDto dto);
+
+    /**
+     * 拣选确认
+     *
+     * @param dto dto实体类
+     */
+    void confirmCheck(SelectOutDto dto);
+}

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

@@ -104,6 +104,31 @@ public class IOStorInvDtl implements Serializable {
 
     /**
      * 是否拣选：0-否 1-是
+     * （质检出库，领料出库，烘干出库）
      */
     private String is_check;
+
+    /**
+     * 称重重量
+     * （质检出库，领料出库，烘干出库）
+     */
+    private BigDecimal weigh_qty;
+
+    /**
+     * 拣选重量
+     * （质检出库，领料出库，烘干出库）
+     */
+    private BigDecimal select_qty;
+
+    /**
+     * 拣选批次
+     * （质检出库，领料出库，烘干出库）
+     */
+    private String select_pcsn;
+
+    /**
+     * 拣选载具
+     * （质检出库，领料出库，烘干出库）
+     */
+    private String select_vehicle;
 }

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

@@ -1,14 +1,42 @@
 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.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_management.service.dto.SelectOutDto;
+
+import java.util.List;
+import java.util.Map;
 
 /**
- * @author dsh
- * 2025/5/21
+ * <p>
+ * 出库入库明细mapper
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-18
  */
 @Mapper
 public interface IOStorInvDtlMapper extends BaseMapper<IOStorInvDtl> {
 
+    /**
+     * 拣选管理分页查询
+     * @param page 分页条件
+     * @param whereJson 查询条件
+     * @return IPage<PdmBomCallMaterialDto>
+     */
+    IPage<SelectOutDto> queryAllByPage(Page<SelectOutDto> page, @Param("param") Map whereJson);
+
+    /**
+     * 获取拣选明细
+     * @param whereJson {
+     *                  出入库明细
+     * }
+     * @return List<JSONObject> 出入库分配明细
+     */
+    List<JSONObject> getSelectDis(@Param("param") JSONObject whereJson);
 }

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper">
+    <select id="queryAllByPage" resultType="org.nl.wms.warehouse_management.service.dto.SelectOutDto">
+        SELECT
+            dtl.*,
+            mater.material_code,
+            mater.material_name,
+            mater.material_spec,
+            mst.stor_name,
+            mst.bill_type,
+            mst.biz_date,
+            mst.bill_code,
+            mst.total_qty,
+            mst.input_optname,
+            mst.input_time
+        FROM
+            st_ivt_iostorinvdtl dtl
+            INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
+            LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
+        <where>
+            mst.is_delete = '0'
+            AND dtl.is_check = '1'
+            AND mst.bill_type IN ('1001','1002','1004')
+
+            <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.bill_code != null and param.bill_code != ''">
+                AND
+                mst.bill_code LIKE #{param.bill_code}
+            </if>
+
+            <if test="param.source_bill_code != null and param.source_bill_code != ''">
+                AND
+                dtl.source_bill_code LIKE #{param.source_bill_code}
+            </if>
+
+            <if test="param.bill_type != null and param.bill_type != ''">
+                AND
+                mst.bill_type = #{param.bill_type}
+            </if>
+
+            <if test="param.stor_id != null and param.stor_id != ''">
+                AND
+                mst.stor_id = #{param.stor_id}
+            </if>
+
+        </where>
+            ORDER BY mst.input_time Desc
+    </select>
+
+    <select id="getSelectDis" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            dis.*,
+            mater.material_code,
+            mater.material_name,
+            mater.material_spec,
+            task.task_code,
+            point.point_name
+        FROM
+            st_ivt_iostorinvdis dis
+            INNER JOIN st_ivt_iostorinvdtl dtl ON dis.iostorinvdtl_id = dtl.iostorinvdtl_id
+            LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
+            LEFT JOIN sch_base_task task ON task.task_id = dis.task_id
+            LEFT JOIN sch_base_point point ON point.point_code = dis.point_code
+        <where>
+            1 = 1
+
+            <if test="param.iostorinvdtl_id != null and param.iostorinvdtl_id != ''">
+                AND
+                dis.iostorinvdtl_id = #{param.iostorinvdtl_id}
+            </if>
+        </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,73 @@
+package org.nl.wms.warehouse_management.service.dto;
+
+import lombok.Data;
+import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 拣选管理dto
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-18
+ */
+@Data
+public class SelectOutDto extends IOStorInvDtl {
+
+    /**
+     * 物料编号
+     */
+    private String material_code;
+
+    /**
+     * 物料名称
+     */
+    private String material_name;
+
+    /**
+     * 物料批次
+     */
+    private String material_spec;
+
+    /**
+     * 单据编号
+     */
+    private String bill_code;
+
+    /**
+     * 仓库名称
+     */
+    private String stor_name;
+
+    /**
+     * 业务类型
+     */
+    private String bill_type;
+
+    /**
+     * 业务日期
+     */
+    private String biz_date;
+
+    /**
+     * 制单人
+     */
+    private String input_optname;
+
+    /**
+     * 制单时间
+     */
+    private String input_time;
+
+    /**
+     * 拣选载具
+     */
+    private String select_vehicle;
+
+    /**
+     * 需求重量
+     */
+    private BigDecimal total_qty;
+}

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

@@ -1195,6 +1195,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
                     .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
                     .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                     .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+                    .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
             );
         }
 
@@ -1238,7 +1239,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
             throw new BadRequestException("未找到任务对应的分配明细");
         }
 
-        // 完成当前分配明细
         ioStorInvDisMapper.update(ioStorInvDis, new LambdaUpdateWrapper<>(IOStorInvDis.class)
                 .set(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
                 .set(IOStorInvDis::getReal_qty, task.getMaterial_qty())
@@ -1257,7 +1257,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
         //修改库存 恢复库存 手持进行减扣
         List<JSONObject> updateIvtList = new ArrayList<>();
         JSONObject jsonIvt = new JSONObject();
-        jsonIvt.put("type", IOSConstant.UPDATE_IVT_TYPE_SUB_FROZEN_ADD_CANUSE);
+        jsonIvt.put("type", IOSConstant.UPDATE_IVT_TYPE_SUB_FROZEN);
         jsonIvt.put("storagevehicle_code", ioStorInvDis.getStoragevehicle_code());
         jsonIvt.put("material_id", ioStorInvDis.getMaterial_id());
         jsonIvt.put("pcsn", ioStorInvDis.getPcsn());
@@ -1267,15 +1267,13 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
         updateIvtList.add(jsonIvt);
         iMdPbStoragevehicleextService.updateIvt(updateIvtList);
 
-        // 判断是否是整出
-        if (ioStorInvDis.getReal_qty().doubleValue() >= ioStorInvDis.getPlan_qty().doubleValue()) {
         //更新组盘记录表
         groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
                 .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
                 .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                 .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+                .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
         );
-        }
 
         // 查询该明细下是否还有未完成的分配明细
         int countDis = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class)

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

@@ -622,6 +622,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
                     .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
                     .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                     .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+                    .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘"))
             );
             // 更新任务完成
             iSchBaseTaskService.update(
@@ -691,6 +692,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
                 .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
                 .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
                 .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+                .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘"))
         );
 
         // 查询该明细下是否还有未完成的分配明细
@@ -760,7 +762,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         }
 
         // 根据库区查询对应库位
-        Structattr structattr = iStructattrService.getOne(new LambdaQueryWrapper<>(Structattr.class)
+        List<Structattr> list = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class)
                 .eq(Structattr::getSect_id, whereJson.getString("sect_id"))
                 .eq(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
                 .eq(Structattr::getIs_delete, IOSConstant.IS_DELETE_NO)
@@ -769,11 +771,11 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
                 .orderByAsc(Structattr::getStruct_code)
         );
 
-        if (ObjectUtil.isEmpty(structattr)) {
+        if (ObjectUtil.isEmpty(list)) {
             throw new BadRequestException("未找到满足的仓位");
         }
 
-        return structattr;
+        return list.get(0);
     }
 
     @Override

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

@@ -0,0 +1,300 @@
+package org.nl.wms.warehouse_management.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.common.exception.BadRequestException;
+import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
+import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
+import org.nl.wms.basedata_manage.service.ISectattrService;
+import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
+import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
+import org.nl.wms.basedata_manage.service.dao.Sectattr;
+import org.nl.wms.ext.service.WmsToAcsService;
+import org.nl.wms.ext.service.util.AcsResponse;
+import org.nl.wms.sch_manage.service.ISchBasePointService;
+import org.nl.wms.sch_manage.service.dao.SchBasePoint;
+import org.nl.wms.warehouse_management.enums.IOSConstant;
+import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_management.service.SelectOutService;
+import org.nl.wms.warehouse_management.service.dao.IOStorInv;
+import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_management.service.dao.IOStorInvDtl;
+import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
+import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
+import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
+import org.nl.wms.warehouse_management.service.dto.SelectOutDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 拣选管理 服务实现类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-18
+ */
+@Service
+public class SelectOutServiceImpl extends ServiceImpl<IOStorInvDtlMapper, IOStorInvDtl> implements SelectOutService {
+
+    /**
+     * 点位信息服务
+     */
+    @Autowired
+    private ISchBasePointService iSchBasePointService;
+
+    /**
+     * 载具信息服务
+     */
+    @Autowired
+    private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService;
+
+    /**
+     * 入库服务
+     */
+    @Autowired
+    private IRawAssistIStorService iRawAssistIStorService;
+
+    /**
+     * 基础物料服务
+     */
+    @Autowired
+    private IMdMeMaterialbaseService iMdMeMaterialbaseService;
+
+    /**
+     * 分配明细mapper
+     */
+    @Autowired
+    private IOStorInvDisMapper ioStorInvDisMapper;
+
+    /**
+     * wms调用acs服务
+     */
+    @Autowired
+    private WmsToAcsService wmsToAcsService;
+
+    /**
+     * 入库明细服务
+     */
+    @Autowired
+    private IOStorInvDtlMapper ioStorInvDtlMapper;
+
+    /**
+     * 库区服务
+     */
+    @Autowired
+    private ISectattrService iSectattrService;
+
+    @Override
+    public IPage<SelectOutDto> queryAll(Map whereJson, PageQuery page) {
+        return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
+                whereJson);
+    }
+
+    @Override
+    public List<JSONObject> getSelectDis(JSONObject whereJson) {
+        return this.baseMapper.getSelectDis(whereJson);
+    }
+
+    @Override
+    public JSONObject getWeigh(JSONObject whereJson) {
+        // 判断当前载具是否是称重位上的载具
+        SchBasePoint pointDao = iSchBasePointService.getById(whereJson.getString("point_code"));
+        if (!pointDao.getVehicle_code().equals(whereJson.getString("storagevehicle_code"))) {
+            throw new BadRequestException("当前称重位载具与拣选载具不符，当前称重位载具为【" + pointDao.getVehicle_code() + "】");
+        }
+        // 获取载具信息
+        MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString(pointDao.getVehicle_code()));
+        if (ObjectUtil.isEmpty(vehicleDao.getWeigth())) {
+            throw new BadRequestException("请维护当前载具重量【" + pointDao.getVehicle_code() + "】");
+        }
+
+        // TODO 调用ACS接口获取称重信息
+        AcsResponse weighAcs = wmsToAcsService.getWeighAcs(new JSONObject());
+        JSONObject jsonResult = weighAcs.getResultData();
+
+        // 称重重量
+        double weigh_qty = NumberUtil.round(jsonResult.getDoubleValue("weigh_qty"), 2).doubleValue();
+        // 扣除载具重量
+        double sub_qty = NumberUtil.sub(weigh_qty, vehicleDao.getWeigth().doubleValue());
+        // 计算拣选重量： 出库重量 - 称重重量（扣除载具重量）
+        double select_qty = NumberUtil.sub(whereJson.getDoubleValue("plan_qty"), sub_qty);
+
+        JSONObject result = new JSONObject();
+        result.put("weigh_qty", NumberUtil.round(sub_qty, 2));
+        result.put("select_qty", NumberUtil.round(select_qty, 2));
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public void saveWeigh(SelectOutDto dto) {
+        IOStorInvDtl dtlDao = this.getById(dto.getIostorinvdtl_id());
+        dtlDao.setWeigh_qty(dto.getWeigh_qty());
+        dtlDao.setSelect_pcsn(dto.getSelect_pcsn());
+        dtlDao.setSelect_qty(dto.getSelect_qty());
+        dtlDao.setSelect_vehicle(dto.getSelect_vehicle());
+        this.updateById(dto);
+    }
+
+    @Override
+    @Transactional
+    public void confirmCheck(SelectOutDto dto) {
+        // 组织入库数据
+        JSONObject resultJson = organizeInsertData(dto);
+        // 调用分配
+        JSONObject resultMap = organizeDivData(resultJson);
+        // 调用下发
+        sendTask(resultMap);
+        // 更新明细是否拣选为否
+        this.update(
+                new UpdateWrapper<IOStorInvDtl>().lambda()
+                    .set(IOStorInvDtl::getIs_check, IOSConstant.IS_DELETE_NO)
+                    .eq(IOStorInvDtl::getIostorinvdtl_id, dto.getIostorinvdtl_id())
+        );
+    }
+
+    /**
+     * 组织入库数据
+     *
+     * @param dto {
+     *            dto
+     *            }
+     * @return JSONObject
+     */
+    private JSONObject organizeInsertData(SelectOutDto dto) {
+        // 原出库明细信息
+        IOStorInvDtl dtlDao = this.getById(dto.getIostorinvdtl_id());
+        // 原出库主表信息
+        IOStorInv mstDao = iRawAssistIStorService.getById(dto.getIostorinv_id());
+        // 原出库分配明细信息
+        IOStorInvDis disDao = ioStorInvDisMapper.selectOne(
+                new QueryWrapper<IOStorInvDis>().lambda()
+                        .eq(IOStorInvDis::getIostorinvdtl_id, dto.getIostorinvdtl_id())
+                        .eq(IOStorInvDis::getStoragevehicle_code, dto.getSelect_vehicle())
+                        .eq(IOStorInvDis::getPcsn, dto.getSelect_pcsn())
+        );
+
+        // 组织主表数据
+        Map<String, Object> jsonMst = new HashMap<>();
+        jsonMst.put("stor_id", mstDao.getStor_id());
+        jsonMst.put("bill_status", IOSEnum.BILL_STATUS.code("生成"));
+        jsonMst.put("total_qty", dto.getWeigh_qty());
+        jsonMst.put("detail_count", 1);
+        jsonMst.put("bill_type", IOSEnum.IN_BILL_TYPE.code("拣选回库"));
+        jsonMst.put("biz_date", DateUtil.now());
+
+        // 组织明细数据
+        ArrayList<HashMap> tableData = new ArrayList<>();
+        HashMap<String, String> dtl = new HashMap<>();
+        dtl.put("storagevehicle_code", disDao.getStoragevehicle_code());
+        dtl.put("pcsn", disDao.getPcsn());
+        dtl.put("qty_unit_id", disDao.getQty_unit_id());
+        dtl.put("qty_unit_name", disDao.getQty_unit_name());
+        dtl.put("qty", dtlDao.getWeigh_qty().toString());
+        MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(disDao.getMaterial_id());
+        dtl.put("material_code", materDao.getMaterial_code());
+        dtl.put("material_name", materDao.getMaterial_name());
+        dtl.put("material_id", materDao.getMaterial_id());
+        dtl.put("plan_qty", dtlDao.getWeigh_qty().toString());
+        // 调用新增
+        tableData.add(dtl);
+        jsonMst.put("tableData", tableData);
+        String iostorinv_id = iRawAssistIStorService.insertDtl(jsonMst);
+
+        JSONObject result = new JSONObject();
+        result.put("sect_id", disDao.getSect_id());
+        result.put("iostorinv_id", iostorinv_id);
+        return result;
+    }
+
+    /**
+     * 组织分配数据
+     *
+     * @param whereJson {
+     *                  iostorinv_id
+     *                  sect_id
+     *                  }
+     * @return JSONObject
+     */
+    private JSONObject organizeDivData(JSONObject whereJson) {
+        // 查询库区
+        Sectattr sectDao = iSectattrService.getById(whereJson.getString("sect_id"));
+        // 组织主数据
+        Map<String, Object> jsonMst = new HashMap<>();
+        jsonMst.put("checked", true);
+        jsonMst.put("sect_id", sectDao.getSect_id());
+        jsonMst.put("stor_id", sectDao.getStor_id());
+        // 组织明细数据
+        IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne(
+                new QueryWrapper<IOStorInvDtl>().lambda()
+                        .eq(IOStorInvDtl::getIostorinv_id, whereJson.getString("iostorinv_id"))
+        );
+        // 查找分配明细
+        Map<String, Object> map = new HashMap<>();
+        map.put("iostorinvdtl_id", dtlDao.getIostorinvdtl_id());
+        List<IOStorInvDisDto> disDtl = iRawAssistIStorService.getDisDtl(map);
+        // 类型转换
+        ArrayList<LinkedHashMap> tableMater = new ArrayList<>();
+        disDtl.forEach(item -> {
+            tableMater.add(JSONObject.parseObject(JSONObject.toJSONString(item), LinkedHashMap.class));
+        });
+        jsonMst.put("tableMater", tableMater);
+        // 调用分配
+        iRawAssistIStorService.divStruct(jsonMst);
+
+        JSONObject result = new JSONObject();
+        result.put("storagevehicle_code", disDtl.get(0).getStoragevehicle_code());
+        result.put("point_code", IOSConstant.CZW_POINT);
+        result.put("sect_id", disDtl.get(0).getSect_id());
+        result.put("iostorinv_id", disDtl.get(0).getIostorinv_id());
+        return result;
+    }
+
+
+    /**
+     * 下发任务
+     *
+     * @param whereJson {
+     *                  storagevehicle_code：载具编码
+     *                  point_code：点位编码
+     *                  sect_id：库区
+     *                  iostorinv_id: id
+     *                  }
+     */
+    private void sendTask(JSONObject whereJson) {
+        // 组织主数据
+        Map<String, Object> jsonMst = new HashMap<>();
+        jsonMst.put("point_code", whereJson.getString("point_code"));
+        // 组织明细数据
+        IOStorInvDtl dtlDao = ioStorInvDtlMapper.selectOne(
+                new QueryWrapper<IOStorInvDtl>().lambda()
+                        .eq(IOStorInvDtl::getIostorinv_id, whereJson.getString("iostorinv_id"))
+        );
+        // 查找分配明细
+        Map<String, Object> map = new HashMap<>();
+        map.put("iostorinvdtl_id", dtlDao.getIostorinvdtl_id());
+        List<IOStorInvDisDto> disDtl = iRawAssistIStorService.getDisDtl(map);
+        // 类型转换
+        ArrayList<LinkedHashMap> tableMater = new ArrayList<>();
+        disDtl.forEach(item -> {
+            tableMater.add(JSONObject.parseObject(JSONObject.toJSONString(item), LinkedHashMap.class));
+        });
+        jsonMst.put("tableMater", tableMater);
+
+        iRawAssistIStorService.divPoint(jsonMst);
+    }
+
+}

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

@@ -240,6 +240,8 @@
         >
           <template slot-scope="scope">
             <udOperation
+              :disabled-edit="scope.row.status !== '1'"
+              :disabled-dle="scope.row.status !== '1'"
               :data="scope.row"
               :permission="permission"
             />

wms/nladmin-ui/src/views/wms/st/selectout/ViewDialog.vue

@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    title="称重信息详情"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="1100px"
+    destroy-on-close
+    @close="close"
+    @open="open"
+  >
+    <el-row :gutter="22">
+      <el-col :span="22" style="border: 1px solid white">
+        <span/>
+      </el-col>
+      <el-col :span="2">
+        <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="18">
+      <el-col :span="18" style="border: 10px solid white">
+        <span/>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form2" :model="formMst" :rules="rules" size="mini" label-width="130px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="物料编码:">
+            <el-input v-model="formMst.material_code" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="物料名称:">
+            <el-input v-model="formMst.material_name" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="物料规格:">
+            <el-input v-model="formMst.material_spec" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="出库重量:">
+            <el-input v-model="formMst.plan_qty" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="拣选批次:">
+            <el-input v-model="formMst.select_pcsn" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="拣选载具:">
+            <el-input v-model="formMst.select_vehicle" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="拣选重量:">
+            <el-input v-model="formMst.select_qty" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="称重重量:">
+            <el-input-number v-model="formMst.weigh_qty" disabled :precision="2" :controls="false" :min="0" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">载具明细</span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="400"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <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="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="plan_qty" label="出库重量" :min-width="flexWidth('plan_qty',crud.data,'出库重量')" />
+        <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
+        <el-table-column prop="struct_code" label="出库仓位" :min-width="flexWidth('struct_code',crud.data,'出库仓位')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="point_name" label="出库点" :min-width="flexWidth('point_name',crud.data,'出库点')" />
+      </el-table>
+    </el-card>
+
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudSectout from '@/views/wms/st/selectout/selectout'
+
+export default {
+  name: 'WeighDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParamWeigh: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.formMst = this.openParamWeigh
+      }
+    }
+  },
+  data() {
+    return {
+      formMst: {
+      },
+      current: null,
+      tabledis: [],
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$refs['form2'].resetFields()
+      this.$emit('update:dialogShow', false)
+    },
+    open() {
+      crudSectout.getSelectDis({}).then(res => {
+        this.tabledis = res
+      })
+    }
+  }
+}
+</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;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+
+</style>

wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue

@@ -0,0 +1,246 @@
+<template>
+  <el-dialog
+    title="称重信息"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="1100px"
+    destroy-on-close
+    @close="close"
+    @open="open"
+  >
+    <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="success" @click="getWeigh">称重</el-button>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="saveWeigh">保存</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-form ref="form2" :model="formMst" :rules="rules" size="mini" label-width="130px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="物料编码:">
+            <el-input v-model="formMst.material_code" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="物料名称:">
+            <el-input v-model="formMst.material_name" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="物料规格:">
+            <el-input v-model="formMst.material_spec" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="出库重量:">
+            <el-input v-model="formMst.plan_qty" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="拣选批次:">
+            <el-input v-model="formMst.select_pcsn" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="拣选载具:">
+            <el-input v-model="formMst.select_vehicle" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="拣选重量:">
+            <el-input v-model="formMst.select_qty" disabled size="mini" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="称重重量:">
+            <el-input-number v-model="formMst.weigh_qty" :precision="2" :controls="false" :min="0" @change="changeQty" style="width: 200px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">载具明细</span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="400"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="currentChange"
+      >
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <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="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="plan_qty" label="出库重量" :min-width="flexWidth('plan_qty',crud.data,'出库重量')" />
+        <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
+        <el-table-column prop="struct_code" label="出库仓位" :min-width="flexWidth('struct_code',crud.data,'出库仓位')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="point_name" label="出库点" :min-width="flexWidth('point_name',crud.data,'出库点')" />
+      </el-table>
+    </el-card>
+
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudSectout from '@/views/wms/st/selectout/selectout'
+
+export default {
+  name: 'WeighDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParamWeigh: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  data() {
+    return {
+      formMst: {
+        material_code: null,
+        material_name: null,
+        material_spec: null,
+        select_pcsn: null,
+        select_qty: 0,
+        weigh_qty: 0,
+        iostorinvdtl_id: null,
+        select_vehicle: null,
+        plan_qty: null
+      },
+      current: null,
+      tabledis: [],
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.formMst.material_code = null
+      this.formMst.material_name = null
+      this.formMst.material_spec = null
+      this.formMst.select_pcsn = null
+      this.formMst.select_vehicle = null
+      this.formMst.select_qty = 0
+      this.formMst.weigh_qty = 0
+      this.formMst.plan_qty = null
+      this.formMst.iostorinvdtl_id = null
+      this.$refs['form2'].resetFields()
+      this.$emit('update:dialogShow', false)
+    },
+    open() {
+      crudSectout.getSelectDis(this.openParamWeigh).then(res => {
+        this.tabledis = res
+      })
+    },
+    currentChange(current) {
+      if (current !== null) {
+        this.current = current
+        this.formMst.material_code = current.material_code
+        this.formMst.material_name = current.material_name
+        this.formMst.material_spec = current.material_spec
+        this.formMst.select_pcsn = current.pcsn
+        this.formMst.plan_qty = current.plan_qty
+        this.formMst.select_vehicle = current.storagevehicle_code
+        this.formMst.select_qty = 0
+        this.formMst.weigh_qty = 0
+        this.formMst.plan_qty = current.plan_qty
+        this.formMst.iostorinvdtl_id = current.iostorinvdtl_id
+      }
+    },
+    changeQty(row) {
+      this.formMst.select_qty = parseFloat(this.current.plan_qty) - parseFloat(row)
+    },
+    getWeigh() {
+      if (!this.formMst.select_pcsn) {
+        this.crud.notify('拣选批次不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.formMst.weigh_qty = '87'
+      this.formMst.select_qty = '1'
+     /* crudSectout.getWeigh(this.current).then(res => {
+        this.formMst.weigh_qty = res.weigh_qty
+        this.formMst.select_qty = res.select_qty
+        this.crud.notify('称重成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })*/
+    },
+    saveWeigh() {
+      // 校验称重信息不能为0或者空
+      if (this.formMst.weigh_qty === 0) {
+        this.crud.notify('称重重量不能为0！', CRUD.NOTIFICATION_TYPE.ERROR)
+        return
+      }
+      crudSectout.saveWeigh(this.formMst).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.close()
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</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;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+
+</style>

wms/nladmin-ui/src/views/wms/st/selectout/index.vue

@@ -0,0 +1,229 @@
+<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.bill_code"
+              clearable
+              size="mini"
+              placeholder="单据编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="源单据号">
+            <el-input
+              v-model="query.source_bill_code"
+              clearable
+              size="mini"
+              placeholder="源单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <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-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_OUT_TYPE"
+                :key="item.value"
+                :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="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="openWeigh"
+        >
+          拣选称重
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="confirmCheck"
+        >
+          拣选确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <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 show-overflow-tooltip prop="bill_code" width="150" label="单据号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
+        <el-table-column prop="bill_type" label="业务类型" :formatter="bill_typeFormat" :min-width="flexWidth('bill_type',crud.data,'业务类型')" />
+        <el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',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="total_qty" label="需求重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="real_qty" label="出库重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="select_pcsn" label="拣选批次" :min-width="flexWidth('select_pcsn',crud.data,'拣选批次')" />
+        <el-table-column prop="select_vehicle" label="拣选载具" :min-width="flexWidth('select_vehicle',crud.data,'拣选载具')" />
+        <el-table-column prop="weigh_qty" label="称重重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="select_qty" label="拣选重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="source_bill_code" label="源单编码" :min-width="flexWidth('source_bill_code',crud.data,'源单编码')" />
+        <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
+        <el-table-column prop="input_optname" label="制单人" :min-width="flexWidth('input_optname',crud.data,'制单人')" />
+        <el-table-column prop="input_time" label="制单时间" :min-width="flexWidth('input_time',crud.data,'制单时间')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <WeighDialog :dialog-show.sync="openWeighDialog" :open-param-weigh="openParamWeigh" />
+    <ViewDialog :dialog-show.sync="ViewDialog" :open-param-weigh="openParamWeigh" />
+  </div>
+</template>
+
+<script>
+import crudSectout from '@/views/wms/st/selectout/selectout'
+import WeighDialog from '@/views/wms/st/selectout/WeighDialog'
+import ViewDialog from '@/views/wms/st/selectout/ViewDialog'
+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 crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
+
+const defaultForm = {
+}
+export default {
+  name: 'SectOut',
+  components: { pagination, crudOperation, rrOperation, udOperation, WeighDialog, ViewDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['BOM_STATUS', 'ST_INV_OUT_TYPE'],
+  cruds() {
+    return CRUD({
+      title: '拣选管理',
+      url: 'api/SectOut',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
+      idField: 'iostorinv_id',
+      sort: 'iostorinv_id,desc',
+      crudMethod: { ...crudSectout }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      storlist: [],
+      openWeighDialog: false,
+      ViewDialog: false,
+      openParamWeigh: null,
+      rules: {
+      }
+    }
+  },
+  created() {
+    crudBsrealstorattr.getStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    openWeigh() {
+      this.openParamWeigh = this.$refs.table.selection[0]
+      this.openWeighDialog = true
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
+    },
+    toView(index, row) {
+      this.openParamWeigh = row
+      this.ViewDialog = true
+    },
+    confirmCheck() {
+      const data = this.$refs.table.selection[0]
+      // 校验称重信息不能为0或者空
+      if (data.select_pcsn === '' || data.select_pcsn === null) {
+        this.crud.notify('请先拣选称重后做此操作！', CRUD.NOTIFICATION_TYPE.ERROR)
+        return
+      }
+      crudSectout.confirmCheck(data).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

wms/nladmin-ui/src/views/wms/st/selectout/selectout.js

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