From 7a728dd973f0ce3a705d9d73a91c8e1e179738c2 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 15 Aug 2025 17:59:47 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=8F=AB=E6=96=99=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MdPbStoragevehicleextMapper.xml    |  24 +-
 .../service/impl/PdaIosInServiceImpl.java     |   2 +-
 .../service/IPdmBomCallMaterialService.java   |   7 +
 .../service/dao/PdmBomCallMaterial.java       |  22 +-
 .../dao/mapper/PdmBomCallMaterialMapper.xml   |   5 +
 .../impl/PdmBomCallMaterialServiceImpl.java   |  24 +
 .../service/util/tasks/DetainInTask.java      |   9 +-
 .../{StOutTask.java => ReceiveOutTask.java}   |  71 ++-
 .../enums/IOSConstant.java                    |  10 +
 .../warehouse_management/enums/IOSEnum.java   |  14 +-
 .../service/dao/IOStorInvDtl.java             |   5 +
 .../service/impl/OutBillServiceImpl.java      | 506 +++++++++++-------
 .../src/views/wms/pdm/callmaterial/index.vue  |  17 +-
 .../src/views/wms/st/outbill/AddDialog.vue    |  56 +-
 .../src/views/wms/st/outbill/AddDtlIos.vue    | 143 +++++
 .../src/views/wms/st/outbill/DivDialog.vue    |  13 +-
 .../src/views/wms/st/outbill/ViewDialog.vue   |   4 +
 17 files changed, 703 insertions(+), 229 deletions(-)
 rename wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/{StOutTask.java => ReceiveOutTask.java} (73%)
 create mode 100644 wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
index 39f1909..4bce95c 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
@@ -131,6 +131,8 @@
             ex.material_id = #{material_id}
             AND
             st.lock_type = 0
+            AND
+            st.sect_code = 'HG01'
         <if test="pcsn!= null and pcsn!= ''">
             AND
             ex.pcsn = #{pcsn}
@@ -139,20 +141,34 @@
     </select>
 
     <select id="queryOutAllocation" resultType="org.nl.wms.basedata_manage.service.dto.MdPbStoragevehicleextDto">
-        SELECT ex.*,st.sect_id,st.sect_code,st.sect_name,st.struct_id,st.struct_code,st.struct_name
-        FROM md_pb_storagevehicleext ex LEFT JOIN st_ivt_structattr st on ex.storagevehicle_code = st.storagevehicle_code
+        SELECT
+            ex.*,
+            st.sect_id,
+            st.sect_code,
+            st.sect_name,
+            st.struct_id,
+            st.struct_code,
+            st.struct_name,
+            TIMESTAMPDIFF(DAY,CURDATE(),late.quality_time) AS quality_day
+        FROM
+            md_pb_storagevehicleext ex
+            INNER JOIN st_ivt_structattr st on ex.storagevehicle_code = st.storagevehicle_code
+            INNER JOIN md_pb_groupplate late on ex.storagevehicle_code = late.storagevehicle_code
+            AND ex.material_id = late.material_id AND ex.pcsn = late.pcsn AND late.status = '2'
         <where>
-            material_id = #{material_id}
+            ex.material_id = #{material_id}
             AND
             ex.canuse_qty > 0
             AND
             st.lock_type = 0
+            AND
+            st.sect_code = 'HG01'
             <if test="pcsn!= null and pcsn!= ''">
                 AND
                 pcsn = #{pcsn}
             </if>
         </where>
-        ORDER BY ex.insert_time,ex.canuse_qty
+        ORDER BY quality_day,ex.insert_time,ex.canuse_qty
     </select>
 
     <select id="erpQueryIvt" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
index 53f1ec9..c565b9b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -323,7 +323,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
         jsonMst.put("bill_status", IOSEnum.BILL_STATUS.code("生成"));
         jsonMst.put("total_qty", total_qty);
         jsonMst.put("detail_count", 1);
-        jsonMst.put("bill_type", IOSEnum.BILL_TYPE.code("生产入库"));
+        jsonMst.put("bill_type", IOSEnum.IN_BILL_TYPE.code("收货入库"));
         jsonMst.put("biz_date", DateUtil.now());
 
         // 组织明细数据
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java
index f0a855b..1c88d2d 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java
@@ -47,4 +47,11 @@ public interface IPdmBomCallMaterialService extends IService<PdmBomCallMaterial>
      * @param ids id集合
      */
     void delete(Set<String> ids);
+
+    /**
+     * 根据工单编码查询
+     * @param bom_code 工单编码
+     * @return PdmBomCallMaterial 实体类
+     */
+    PdmBomCallMaterial findByCode (String bom_code);
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java
index c18c5a1..00b938a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java
@@ -34,6 +34,11 @@ public class PdmBomCallMaterial implements Serializable {
      */
     private String material_id;
 
+    /**
+     * 叫料单号
+     */
+    private String bom_code;
+
     /**
      * 设备编码
      */
@@ -45,15 +50,30 @@ public class PdmBomCallMaterial implements Serializable {
     private BigDecimal call_qty;
 
     /**
-     * 实际重量
+     * 实际出库重量
      */
     private BigDecimal real_qty;
 
+    /**
+     * 实际用料总量
+     */
+    private BigDecimal real_weigh_qty;
+
     /**
      * 工单状态
      */
     private String bom_status;
 
+    /**
+     * 单位标识
+     */
+    private String qty_unit_id;
+
+    /**
+     * 单位名称
+     */
+    private String qty_unit_name;
+
     /**
      * 创建人
      */
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml
index 103471c..19a8ec0 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml
@@ -24,6 +24,11 @@
                 bom.device_code LIKE #{param.device_code}
             </if>
 
+            <if test="param.bom_code != null and param.bom_code != ''">
+                AND
+                bom.bom_code LIKE #{param.bom_code}
+            </if>
+
             <if test="param.bom_status != null and param.bom_status != ''">
                 AND
                 bom.bom_status = #{param.bom_status}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java
index 14ee959..6caed60 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java
@@ -1,17 +1,22 @@
 package org.nl.wms.pdm_manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
+import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
 import org.nl.wms.pdm_manage.enums.BomEnum;
 import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService;
 import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial;
 import org.nl.wms.pdm_manage.service.dao.mapper.PdmBomCallMaterialMapper;
 import org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,6 +34,12 @@ import java.util.Set;
 @Service
 public class PdmBomCallMaterialServiceImpl extends ServiceImpl<PdmBomCallMaterialMapper, PdmBomCallMaterial> implements IPdmBomCallMaterialService {
 
+    /**
+     * 计量单位服务
+     */
+    @Autowired
+    private IMdPbMeasureunitService iMdPbMeasureunitService;
+
     @Override
     public IPage<PdmBomCallMaterialDto> queryAll(Map whereJson, PageQuery page) {
         return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -40,6 +51,11 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl<PdmBomCallMateria
     public void create(PdmBomCallMaterial dto) {
         dto.setBom_id(IdUtil.getStringId());
         dto.setBom_status(BomEnum.CALL_BOM_STATUS.code("生成"));
+        dto.setBom_code(CodeUtil.getNewCode("BOM_CODE"));
+        // 计量单位默认重量KG
+        MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode("KG");
+        dto.setQty_unit_id(unitDao.getMeasure_unit_id());
+        dto.setQty_unit_name(unitDao.getUnit_name());
         dto.setCreate_id(SecurityUtils.getCurrentUserId());
         dto.setCreate_name(SecurityUtils.getCurrentNickName());
         dto.setCreate_time(DateUtil.now());
@@ -57,4 +73,12 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl<PdmBomCallMateria
     public void delete(Set<String> ids) {
         this.baseMapper.deleteBatchIds(ids);
     }
+
+    @Override
+    public PdmBomCallMaterial findByCode(String bom_code) {
+        return this.baseMapper.selectOne(
+                new QueryWrapper<PdmBomCallMaterial>().lambda()
+                    .eq(PdmBomCallMaterial::getBom_code, bom_code)
+        );
+    }
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java
index 8299935..999ec9a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java
@@ -27,9 +27,12 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 
 /**
- * @Author: Liuxy
- * @Description: 退货入库任务类
- * @Date: 2025/8/12
+ * <p>
+ * 收货入库任务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-15
  */
 @Component(value = "DetainInTask")
 @TaskType("DetainInTask")
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java
similarity index 73%
rename from wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
rename to wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java
index dc61268..a02811b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java
@@ -4,12 +4,16 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 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.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.ISchBasePointService;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
+import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 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;
@@ -25,35 +29,57 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 
 /**
- * @Author: Liuxy
- * @Description: 入库任务类
- * @Date: 2025/5/25
+ * <p>
+ * 领料出库任务类
+ * </p>
+ *
+ * @author Liuxy
+ * @since 2025-08-15
  */
-@Component(value = "STOutTask")
-@TaskType("STOutTask")
-public class StOutTask extends AbstractTask {
+@Component(value = "ReceiveOutTask")
+@TaskType("ReceiveOutTask")
+public class ReceiveOutTask extends AbstractTask {
+
+    /**
+     * 任务服务
+     */
     @Autowired
     private ISchBaseTaskService taskService;
 
+    /**
+     * 出库服务
+     */
     @Resource
     private IOutBillService outBillService;
 
+    /**
+     * 分配明细mapper
+     */
     @Resource
     private IOStorInvDisMapper ioStorInvDisMapper;
 
+    /**
+     * 点位服务
+     */
+    @Resource
+    private ISchBasePointService iSchBasePointService;
+
     @Override
     public String create(JSONObject json) {
         SchBaseTask task = new SchBaseTask();
         task.setTask_id(IdUtil.getStringId());
         task.setTask_code(json.getString("TaskCode"));
         task.setTask_status(TaskStatus.CREATE.getCode());
-        task.setConfig_code(json.getString("task_type"));
-        task.setPoint_code1(json.getString("PickingLocation"));
-        task.setPoint_code2(json.getString("PlacedLocation"));
+        task.setConfig_code(ReceiveOutTask.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.setPriority(json.getString("Priority"));
+        task.setTask_type(TaskEnum.TASK_TYPE.code("料箱"));
         task.setCreate_id(SecurityUtils.getCurrentUserId());
         task.setCreate_name(SecurityUtils.getCurrentNickName());
         task.setCreate_time(DateUtil.now());
@@ -98,10 +124,10 @@ public class StOutTask extends AbstractTask {
             taskService.updateById(taskObj);
         }
         if (status.equals(TaskStatus.FINISHED)) {
-             this.finishTask(taskObj);
+            this.finishTask(taskObj);
         }
         if (status.equals(TaskStatus.CANCELED)) {
-             this.cancelTask(taskObj);
+            this.cancelTask(taskObj);
         }
     }
 
@@ -111,7 +137,7 @@ public class StOutTask extends AbstractTask {
         if (ObjectUtil.isEmpty(taskObj)) {
             throw new BadRequestException("该任务不存在");
         }
-         this.finishTask(taskObj);
+        this.finishTask(taskObj);
     }
 
     @Override
@@ -132,6 +158,13 @@ public class StOutTask extends AbstractTask {
 
     @Transactional(rollbackFor = Exception.class)
     public void finishTask(SchBaseTask taskObj) {
+        // 更新终点
+        iSchBasePointService.update(
+                new UpdateWrapper<SchBasePoint>().lambda()
+                        .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2())
+                        .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code())
+                        .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("有箱有料"))
+        );
         // 任务完成
         taskObj.setTask_status(TaskStatus.FINISHED.getCode());
         taskObj.setRemark("已完成");
@@ -146,17 +179,17 @@ public class StOutTask extends AbstractTask {
         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())
+                .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)
+        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())
+                .eq(IOStorInvDis::getTask_id, taskObj.getTask_id())
         );
 
         // 更新任务状态
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
index c0e3b5b..75ce973 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java
@@ -17,6 +17,11 @@ public class IOSConstant {
      */
     public final static String IS_DELETE_YES = "1";
 
+    /**
+     * 数字2
+     */
+    public final static String TWO = "2";
+
     /**
      * 出入库 入库
      */
@@ -85,4 +90,9 @@ public class IOSConstant {
      * 称重位
      */
     public final static String CZW_POINT = "CZW01";
+
+    /**
+     * 物料id：焊丝（盘状）
+     */
+    public final static String MATERIAL_HS_PZ = "1945687018646409216";
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
index c1e7ab4..cd72933 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSEnum.java
@@ -28,13 +28,25 @@ public enum IOSEnum {
     BILL_STATUS(MapOf.of("生成","10", "分配中", "20", "分配完", "30", "完成", "99")),
 
     // 入库业务类型
-    BILL_TYPE(MapOf.of("生产入库","0001", "手工入库", "0009")),
+    IN_BILL_TYPE(MapOf.of("收货入库","0001", "退料入库","0002" , "合箱入库","0003"
+            ,"拼箱入库", "0004" ,"手工入库", "0009"
+    )),
+
+    // 入库业务类型
+    OUT_BILL_TYPE(MapOf.of("领料出库","1001", "质检出库","1002" , "退货出库","1003"
+            ,"烘干出库", "1004" ,"手工出库", "1009"
+    )),
 
     // 入库任务配置类编码
     IN_CONFIG_CODE(MapOf.of("0001","DetainInTask", "0002", "BackInTask",
             "0003", "GeBoxInTask", "0004", "PieceBoxInTask", "0009", "HandInTask"
     )),
 
+    // 出库任务配置类编码
+    OUT_CONFIG_CODE(MapOf.of("1001","ReceiveOutTask", "1002", "QualityOutTask",
+            "1003", "BackOutTask", "1004", "HotOutTask", "1009", "HandOutTask"
+    )),
+
     //入库分配明细状态
     INBILL_DIS_STATUS(MapOf.of("未生成", "00", "生成", "01", "执行中", "02", "完成", "99")),
 
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java
index eae2115..13bcd73 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java
@@ -101,4 +101,9 @@ public class IOStorInvDtl implements Serializable {
      * 未分配数量
      */
     private BigDecimal unassign_qty;
+
+    /**
+     * 是否拣选：0-否 1-是
+     */
+    private String is_check;
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
index eab8703..c30fe33 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
@@ -9,6 +9,7 @@ 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.conditions.update.LambdaUpdateWrapper;
+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;
@@ -17,7 +18,6 @@ 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.config.SpringContextHolder;
 import org.nl.wms.basedata_manage.enums.BaseDataEnum;
 import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
 import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
@@ -25,12 +25,16 @@ import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleextMapper;
 import org.nl.wms.basedata_manage.service.dto.MdPbStoragevehicleextDto;
+import org.nl.wms.pdm_manage.enums.BomEnum;
+import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService;
+import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.sch_manage.service.dao.SchBaseTask;
 import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper;
-import org.nl.wms.sch_manage.service.util.tasks.StOutTask;
+import org.nl.wms.sch_manage.service.util.AbstractTask;
+import org.nl.wms.sch_manage.service.util.TaskFactory;
 import org.nl.wms.warehouse_management.enums.IOSConstant;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
 import org.nl.wms.warehouse_management.service.IOutBillService;
@@ -44,6 +48,7 @@ import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDtlMapper;
 import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvMapper;
 import org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto;
 import org.nl.wms.warehouse_management.service.dto.IOStorInvDtlDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,17 +62,29 @@ import java.util.stream.Collectors;
  * 2025/5/29
  */
 @Service
-public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> implements IOutBillService {
+public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> implements IOutBillService {
 
+    /*
+     * 主表mapper
+     */
     @Resource
     private IOStorInvMapper ioStorInvMapper;
 
+    /*
+     * 分配明细mapper
+     */
     @Resource
     private IOStorInvDisMapper ioStorInvDisMapper;
 
+    /*
+     * 仓位服务
+     */
     @Resource
     private IStructattrService iStructattrService;
 
+    /*
+     * 载具扩展属性服务
+     */
     @Resource
     private IMdPbStoragevehicleextService iMdPbStoragevehicleextService;
 
@@ -77,24 +94,47 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
     @Resource
     private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper;
 
-    /**
+    /*
      * 任务服务
      */
     @Resource
     private ISchBaseTaskService iSchBaseTaskService;
 
+    /*
+     * 仓库服务
+     */
     @Resource
     private IBsrealStorattrService iBsrealStorattrService;
 
+    /*
+     * 明细mapper
+     */
     @Resource
     private IOStorInvDtlMapper ioStorInvDtlMapper;
 
+    /*
+     * 组盘记录服务
+     */
     @Resource
     private GroupPlateMapper groupPlateMapper;
 
+    /*
+     * 点位服务
+     */
     @Resource
     private SchBasePointMapper schBasePointMapper;
 
+    /*
+     * 叫料单服务
+     */
+    @Resource
+    private IPdmBomCallMaterialService iPdmBomCallMaterialService;
+
+    /**
+     * 任务工厂服务
+     */
+    @Autowired
+    private TaskFactory taskFactory;
 
     @Override
     public IPage<IOStorInv> pageQuery(Map whereJson, PageQuery page, String[] stor_id, String[] bill_status, String[] bill_type) {
@@ -118,7 +158,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 String[] s = pcsn.split(" ");
                 String pcsn_in = String.join("','", Arrays.asList(s));
 
-                map.put("pcsn_in", "('"+pcsn_in+"')");
+                map.put("pcsn_in", "('" + pcsn_in + "')");
                 map.put("pcsn", "");
             } else {
                 map.put("pcsn", "%" + map.get("pcsn") + "%");
@@ -161,7 +201,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             map.put("billTypes", billTypes);
         }
 
-        return ioStorInvMapper.queryOutBillPage(new Page<>(page.getPage()+1,page.getSize()),map);
+        return ioStorInvMapper.queryOutBillPage(new Page<>(page.getPage() + 1, page.getSize()), map);
     }
 
     @Override
@@ -185,25 +225,25 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         String now = DateUtil.now();
 
         JSONObject iostorinv_json = new JSONObject();
-        iostorinv_json.put("iostorinv_id",iostorinv_id);
-        iostorinv_json.put("stor_id",whereJson.get("stor_id"));
-        iostorinv_json.put("stor_code",whereJson.get("stor_code"));
-        iostorinv_json.put("stor_name",whereJson.get("stor_name"));
-        iostorinv_json.put("total_qty",whereJson.get("total_qty"));
-        iostorinv_json.put("detail_count",whereJson.get("detail_count"));
-        iostorinv_json.put("biz_date",whereJson.get("biz_date"));
-        iostorinv_json.put("bill_type",whereJson.get("bill_type"));
-        iostorinv_json.put("remark",whereJson.get("remark"));
-        iostorinv_json.put("update_optid",currentUserId);
-        iostorinv_json.put("update_optname",nickName);
-        iostorinv_json.put("update_time",now);
+        iostorinv_json.put("iostorinv_id", iostorinv_id);
+        iostorinv_json.put("stor_id", whereJson.get("stor_id"));
+        iostorinv_json.put("stor_code", whereJson.get("stor_code"));
+        iostorinv_json.put("stor_name", whereJson.get("stor_name"));
+        iostorinv_json.put("total_qty", whereJson.get("total_qty"));
+        iostorinv_json.put("detail_count", whereJson.get("detail_count"));
+        iostorinv_json.put("biz_date", whereJson.get("biz_date"));
+        iostorinv_json.put("bill_type", whereJson.get("bill_type"));
+        iostorinv_json.put("remark", whereJson.get("remark"));
+        iostorinv_json.put("update_optid", currentUserId);
+        iostorinv_json.put("update_optname", nickName);
+        iostorinv_json.put("update_time", now);
 
         ioStorInvMapper.updateById(iostorinv_json.toJavaObject(IOStorInv.class));
 
         //先删除该单据下的所有明细
-        ioStorInvDtlMapper.delete(new LambdaQueryWrapper<>(IOStorInvDtl.class).eq(IOStorInvDtl::getIostorinv_id,iostorinv_id));
+        ioStorInvDtlMapper.delete(new LambdaQueryWrapper<>(IOStorInvDtl.class).eq(IOStorInvDtl::getIostorinv_id, iostorinv_id));
 
-        ioStorInvDisMapper.delete(new LambdaQueryWrapper<>(IOStorInvDis.class).eq(IOStorInvDis::getIostorinv_id,iostorinv_id));
+        ioStorInvDisMapper.delete(new LambdaQueryWrapper<>(IOStorInvDis.class).eq(IOStorInvDis::getIostorinv_id, iostorinv_id));
         ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("tableData");
 
         for (int i = 0; i < rows.size(); i++) {
@@ -291,7 +331,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         for (int i = 0; i < array.size(); i++) {
             JSONObject row = array.getJSONObject(i);
             // 校验计划数量不能为零
-            double plan_qty = row.getDoubleValue("qty");
+            double plan_qty = row.getDoubleValue("plan_qty");
             if (Double.compare(plan_qty, 0.0) == 0) {
                 throw new BadRequestException("数量不能为0");
             }
@@ -309,6 +349,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             ioStorInvDtl.put("remark", row.getString("remark"));
             ioStorInvDtl.put("assign_qty", "0");
             ioStorInvDtl.put("unassign_qty", row.get("plan_qty"));
+            ioStorInvDtl.put("source_bill_code", row.get("source_bill_code"));
 
             ioStorInvDtlMapper.insert(ioStorInvDtl.toJavaObject(IOStorInvDtl.class));
 
@@ -366,20 +407,21 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             String material_id = dtl.getMaterial_id();
 
             // 根据物料和批次号查询库存可用
-            BigDecimal canuseSum = mdPbStoragevehicleextMapper.queryCanuseSum(pcsn,material_id);
+            BigDecimal canuseSum = mdPbStoragevehicleextMapper.queryCanuseSum(pcsn, material_id);
 
-            if (ObjectUtil.isEmpty(canuseSum) || canuseSum.doubleValue()<unassign_qty){
-                throw new BadRequestException("物料编号:"+ dtl.getMaterial_code() +"出库分配数量不满足");
+            if (ObjectUtil.isEmpty(canuseSum) || canuseSum.doubleValue() < unassign_qty) {
+                throw new BadRequestException("物料编号:" + dtl.getMaterial_code() + "出库分配数量不满足");
             }
 
             /*
              * 分配规则：
-             *  1.按批次先进先出
-             *  2.相同批次载具量小优先
+             *  1.优先保质期到期的先出
+             *  2.按批次先进先出
+             *  3.相同批次载具量小优先
              */
 
             //出库分配查询货位信息
-            List<MdPbStoragevehicleextDto> outAllocationList = mdPbStoragevehicleextMapper.queryOutAllocation(pcsn,material_id);
+            List<MdPbStoragevehicleextDto> outAllocationList = mdPbStoragevehicleextMapper.queryOutAllocation(pcsn, material_id);
 
             int seq_no = 1;
             double allocation_canuse_qty = 0;
@@ -389,7 +431,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 ioStorInvDis.setIostorinvdis_id(IdUtil.getStringId());
                 ioStorInvDis.setIostorinv_id(dtl.getIostorinv_id());
                 ioStorInvDis.setIostorinvdtl_id(dtl.getIostorinvdtl_id());
-                ioStorInvDis.setSeq_no((seq_no++)+"");
+                ioStorInvDis.setSeq_no((seq_no++) + "");
                 ioStorInvDis.setSect_id(outAllocation.getSect_id());
                 ioStorInvDis.setPcsn(outAllocation.getPcsn());
                 ioStorInvDis.setMaterial_id(material_id);
@@ -404,17 +446,9 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 ioStorInvDis.setQty_unit_name(outAllocation.getQty_unit_name());
                 ioStorInvDis.setWork_status(IOSEnum.INBILL_DIS_STATUS.code("未生成"));
 
-                // 未分配数量 - 该库位上的可用数量 < 0 目前做整出
-//                double canuse_qty = outAllocation.getCanuse_qty().doubleValue();
-//                if (unassign_qty-canuse_qty>=0){
-//                    ioStorInvDis.setPlan_qty(BigDecimal.valueOf(canuse_qty));
-//                }else {
-//                    ioStorInvDis.setPlan_qty(BigDecimal.valueOf(unassign_qty));
-//                }
-//                unassign_qty = unassign_qty-canuse_qty;
-                unassign_qty = unassign_qty-outAllocation.getCanuse_qty().doubleValue();
-                if (unassign_qty<0){
-                    unassign_qty=0;
+                unassign_qty = unassign_qty - outAllocation.getCanuse_qty().doubleValue();
+                if (unassign_qty < 0) {
+                    unassign_qty = 0;
                 }
                 allocation_canuse_qty = allocation_canuse_qty + outAllocation.getCanuse_qty().doubleValue();
                 ioStorInvDis.setPlan_qty(outAllocation.getCanuse_qty());
@@ -426,7 +460,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 lock_map.put("inv_code", ioStorInv.getBill_code());
                 lock_map.put("inv_type", ioStorInv.getBill_type());
                 lock_map.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
-                iStructattrService.updateStatusByCode("0",lock_map);
+                iStructattrService.updateStatusByCode("0", lock_map);
 
                 //生成分配明细
                 ioStorInvDisMapper.insert(ioStorInvDis);
@@ -445,24 +479,30 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 iMdPbStoragevehicleextService.updateIvt(updateIvtList);
 
                 //分配完成 结束分配
-                if (unassign_qty==0){
+                if (unassign_qty == 0) {
                     break;
                 }
             }
 
-            //更新详情
+            //更新明细
             dtl.setBill_status(IOSEnum.BILL_STATUS.code("分配完"));
             double assign_qty = allocation_canuse_qty + dtl.getAssign_qty().doubleValue();
             dtl.setUnassign_qty(BigDecimal.valueOf(unassign_qty));
             dtl.setAssign_qty(BigDecimal.valueOf(assign_qty));
+            // 校验明细是否需要拣选
+            boolean is_check = checkIosDtl(dtl);
+            if (is_check) {
+                dtl.setIs_check(IOSConstant.IS_DELETE_YES);
+            }
+
             ioStorInvDtlMapper.updateById(dtl);
         }
 
         //更新主表
         //根据单据标识判断明细是否都已经分配完成
         int disCount = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                .eq(IOStorInvDtl::getIostorinv_id,iostorinv_id)
-                .lt(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("分配完"))
+                .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
+                .lt(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配完"))
         );
         // 根据分配货位情况 更新主表单据状态
         IOStorInv ios = new IOStorInv();
@@ -470,8 +510,12 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setUpdate_optid(currentUserId);
         ios.setUpdate_optname(nickName);
         ios.setUpdate_time(now);
-        ios.setBill_status(disCount>0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
+        ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
         ioStorInvMapper.updateById(ios);
+
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("叫料中"));
+
     }
 
     @Override
@@ -485,17 +529,17 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         String iostorinv_id = whereJson.getString("iostorinv_id");
 
         List<IOStorInvDis> ioStorInvDisList = ioStorInvDisMapper.selectList(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .le(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("未生成"))
-                .eq(IOStorInvDis::getIs_issued,BaseDataEnum.IS_YES_NOT.code("否"))
-                .eq(IOStorInvDis::getIostorinv_id,iostorinv_id)
+                .le(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("未生成"))
+                .eq(IOStorInvDis::getIs_issued, BaseDataEnum.IS_YES_NOT.code("否"))
+                .eq(IOStorInvDis::getIostorinv_id, iostorinv_id)
         );
-        if (ObjectUtil.isEmpty(ioStorInvDisList)){
+        if (ObjectUtil.isEmpty(ioStorInvDisList)) {
             throw new BadRequestException("不存在可取消的出库分配明细");
         }
         //需要更新的出入库单明细
         Set<String> dtlSet = new HashSet<>();
 
-        for (IOStorInvDis ioStorInvDis:ioStorInvDisList){
+        for (IOStorInvDis ioStorInvDis : ioStorInvDisList) {
 
             //添加需要更新的明细标识
             dtlSet.add(ioStorInvDis.getIostorinvdtl_id());
@@ -519,7 +563,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             unlock_map.put("inv_type", null);
             unlock_map.put("inv_id", null);
             unlock_map.put("inv_code", null);
-            iStructattrService.updateStatusByCode("2",unlock_map);
+            iStructattrService.updateStatusByCode("2", unlock_map);
 
             //删除出入库单分配表
             ioStorInvDisMapper.deleteById(ioStorInvDis.getIostorinvdis_id());
@@ -527,12 +571,12 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         }
 
         //更新出库明细单状态
-        for (String dtlId:dtlSet){
+        for (String dtlId : dtlSet) {
             IOStorInvDtl ioStorInvDtl = ioStorInvDtlMapper.selectById(dtlId);
             ioStorInvDtl.setAssign_qty(BigDecimal.ZERO);
             ioStorInvDtl.setUnassign_qty(ioStorInvDtl.getPlan_qty());
             ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
-
+            ioStorInvDtl.setIs_check(IOSConstant.IS_DELETE_NO);
             ioStorInvDtlMapper.updateById(ioStorInvDtl);
         }
 
@@ -545,6 +589,9 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
         ioStorInvMapper.updateById(ios);
 
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("生成"));
+
     }
 
     @Override
@@ -581,10 +628,10 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             String material_id = dtl.getMaterial_id();
 
             // 根据物料和批次号查询库存可用
-            BigDecimal canuseSum = mdPbStoragevehicleextMapper.queryCanuseSum(pcsn,material_id);
+            BigDecimal canuseSum = mdPbStoragevehicleextMapper.queryCanuseSum(pcsn, material_id);
 
-            if (canuseSum.doubleValue()<unassign_qty){
-                throw new BadRequestException("物料编号:"+ dtl.getMaterial_code() +"出库分配数量不满足");
+            if (canuseSum.doubleValue() < unassign_qty) {
+                throw new BadRequestException("物料编号:" + dtl.getMaterial_code() + "出库分配数量不满足");
             }
 
             /*
@@ -594,7 +641,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
              */
 
             //出库分配查询货位信息
-            List<MdPbStoragevehicleextDto> outAllocationList = mdPbStoragevehicleextMapper.queryOutAllocation(pcsn,material_id);
+            List<MdPbStoragevehicleextDto> outAllocationList = mdPbStoragevehicleextMapper.queryOutAllocation(pcsn, material_id);
 
             int seq_no = 1;
             double allocation_canuse_qty = 0;
@@ -604,7 +651,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 ioStorInvDis.setIostorinvdis_id(IdUtil.getStringId());
                 ioStorInvDis.setIostorinv_id(dtl.getIostorinv_id());
                 ioStorInvDis.setIostorinvdtl_id(dtl.getIostorinvdtl_id());
-                ioStorInvDis.setSeq_no((seq_no++)+"");
+                ioStorInvDis.setSeq_no((seq_no++) + "");
                 ioStorInvDis.setSect_id(outAllocation.getSect_id());
                 ioStorInvDis.setPcsn(outAllocation.getPcsn());
                 ioStorInvDis.setMaterial_id(material_id);
@@ -627,9 +674,9 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
 //                    ioStorInvDis.setPlan_qty(BigDecimal.valueOf(unassign_qty));
 //                }
 //                unassign_qty = unassign_qty-canuse_qty;
-                unassign_qty = unassign_qty-outAllocation.getCanuse_qty().doubleValue();
-                if (unassign_qty<0){
-                    unassign_qty=0;
+                unassign_qty = unassign_qty - outAllocation.getCanuse_qty().doubleValue();
+                if (unassign_qty < 0) {
+                    unassign_qty = 0;
                 }
                 allocation_canuse_qty = allocation_canuse_qty + outAllocation.getCanuse_qty().doubleValue();
                 ioStorInvDis.setPlan_qty(outAllocation.getCanuse_qty());
@@ -641,7 +688,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 lock_map.put("inv_code", ioStorInv.getBill_code());
                 lock_map.put("inv_type", ioStorInv.getBill_type());
                 lock_map.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
-                iStructattrService.updateStatusByCode("0",lock_map);
+                iStructattrService.updateStatusByCode("0", lock_map);
 
                 //生成分配明细
                 ioStorInvDisMapper.insert(ioStorInvDis);
@@ -660,24 +707,29 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 iMdPbStoragevehicleextService.updateIvt(updateIvtList);
 
                 //分配完成 结束分配
-                if (unassign_qty==0){
+                if (unassign_qty == 0) {
                     break;
                 }
             }
 
-            //更新详情
+            //更新明细
             dtl.setBill_status(IOSEnum.BILL_STATUS.code("分配完"));
             double assign_qty = allocation_canuse_qty + dtl.getAssign_qty().doubleValue();
             dtl.setUnassign_qty(BigDecimal.valueOf(unassign_qty));
             dtl.setAssign_qty(BigDecimal.valueOf(assign_qty));
+            // 校验明细是否需要拣选
+            boolean is_check = checkIosDtl(dtl);
+            if (is_check) {
+                dtl.setIs_check(IOSConstant.IS_DELETE_YES);
+            }
             ioStorInvDtlMapper.updateById(dtl);
         }
 
         //更新主表
         //根据单据标识判断明细是否都已经分配完成
         int disCount = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                .eq(IOStorInvDtl::getIostorinv_id,iostorinv_id)
-                .lt(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("分配完"))
+                .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
+                .lt(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配完"))
         );
 
         // 根据分配货位情况 更新主表单据状态
@@ -686,8 +738,11 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setUpdate_optid(currentUserId);
         ios.setUpdate_optname(nickName);
         ios.setUpdate_time(now);
-        ios.setBill_status(disCount>0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
+        ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
         ioStorInvMapper.updateById(ios);
+
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("叫料中"));
     }
 
     @Override
@@ -699,18 +754,18 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         String iostorinv_id = whereJson.getString("iostorinv_id");
 
         List<IOStorInvDis> ioStorInvDisList = ioStorInvDisMapper.selectList(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .le(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("未生成"))
-                .eq(IOStorInvDis::getIs_issued,BaseDataEnum.IS_YES_NOT.code("否"))
-                .eq(IOStorInvDis::getIostorinv_id,iostorinv_id)
-                .eq(IOStorInvDis::getIostorinvdtl_id,whereJson.getString("iostorinvdtl_id"))
+                .le(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("未生成"))
+                .eq(IOStorInvDis::getIs_issued, BaseDataEnum.IS_YES_NOT.code("否"))
+                .eq(IOStorInvDis::getIostorinv_id, iostorinv_id)
+                .eq(IOStorInvDis::getIostorinvdtl_id, whereJson.getString("iostorinvdtl_id"))
         );
-        if (ObjectUtil.isEmpty(ioStorInvDisList)){
+        if (ObjectUtil.isEmpty(ioStorInvDisList)) {
             throw new BadRequestException("不存在可取消的出库分配明细");
         }
         //需要更新的出入库单明细
         Set<String> dtlSet = new HashSet<>();
 
-        for (IOStorInvDis ioStorInvDis:ioStorInvDisList){
+        for (IOStorInvDis ioStorInvDis : ioStorInvDisList) {
 
             //添加需要更新的明细标识
             dtlSet.add(ioStorInvDis.getIostorinvdtl_id());
@@ -734,7 +789,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             unlock_map.put("inv_type", null);
             unlock_map.put("inv_id", null);
             unlock_map.put("inv_code", null);
-            iStructattrService.updateStatusByCode("2",unlock_map);
+            iStructattrService.updateStatusByCode("2", unlock_map);
 
             //删除出入库单分配表
             ioStorInvDisMapper.deleteById(ioStorInvDis.getIostorinvdis_id());
@@ -742,11 +797,12 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         }
 
         //更新出库明细单状态
-        for (String dtlId:dtlSet){
+        for (String dtlId : dtlSet) {
             IOStorInvDtl ioStorInvDtl = ioStorInvDtlMapper.selectById(dtlId);
             ioStorInvDtl.setAssign_qty(BigDecimal.ZERO);
             ioStorInvDtl.setUnassign_qty(ioStorInvDtl.getPlan_qty());
             ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+            ioStorInvDtl.setIs_check(IOSConstant.IS_DELETE_NO);
 
             ioStorInvDtlMapper.updateById(ioStorInvDtl);
         }
@@ -754,9 +810,9 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         //更新主表
         //根据单据标识判断明细是否都已经分配完成
         int disCount = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                .eq(IOStorInvDtl::getIostorinv_id,iostorinv_id)
-                .le(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("分配完"))
-                .gt(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("生成"))
+                .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
+                .le(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配完"))
+                .gt(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("生成"))
         );
 
         // 根据分配货位情况 更新主表单据状态
@@ -765,8 +821,11 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setUpdate_optid(currentUserId);
         ios.setUpdate_optname(nickName);
         ios.setUpdate_time(now);
-        ios.setBill_status(disCount>0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("生成"));
+        ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("生成"));
         ioStorInvMapper.updateById(ios);
+
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("生成"));
     }
 
     @Override
@@ -804,11 +863,11 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             throw new BadRequestException("当前订单无可分配出库明细");
         }
 
-        for (IOStorInvDtlDto dtl:dtls){
+        for (IOStorInvDtlDto dtl : dtls) {
             double unassign_qty = dtl.getUnassign_qty().doubleValue();
             //分配数量
             double allocation_canuse_qty = 0;
-            for (int i = 0; i < rows.size(); i++){
+            for (int i = 0; i < rows.size(); i++) {
                 JSONObject ivt = rows.getJSONObject(i);
                 double canuse_qty = ivt.getDoubleValue("canuse_qty");
                 //分配明细
@@ -816,7 +875,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 ioStorInvDis.setIostorinvdis_id(IdUtil.getStringId());
                 ioStorInvDis.setIostorinv_id(dtl.getIostorinv_id());
                 ioStorInvDis.setIostorinvdtl_id(dtl.getIostorinvdtl_id());
-                ioStorInvDis.setSeq_no((i+1)+"");
+                ioStorInvDis.setSeq_no((i + 1) + "");
                 ioStorInvDis.setSect_id(ivt.getString("sect_id"));
                 ioStorInvDis.setPcsn(ivt.getString("pcsn"));
                 ioStorInvDis.setMaterial_id(dtl.getMaterial_id());
@@ -842,12 +901,12 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
 //                if (unassign_qty<0){
 //                    unassign_qty=0;
 //                }
-                if (unassign_qty <= 0){
+                if (unassign_qty <= 0) {
                     throw new BadRequestException("已全部分配完，未分配数量为0");
                 }
-                unassign_qty = unassign_qty-canuse_qty;
-                if (unassign_qty<0){
-                    unassign_qty=0;
+                unassign_qty = unassign_qty - canuse_qty;
+                if (unassign_qty < 0) {
+                    unassign_qty = 0;
                 }
                 allocation_canuse_qty = allocation_canuse_qty + canuse_qty;
                 ioStorInvDis.setPlan_qty(BigDecimal.valueOf(canuse_qty));
@@ -859,7 +918,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 lock_map.put("inv_code", ioStorInv.getBill_code());
                 lock_map.put("inv_type", ioStorInv.getBill_type());
                 lock_map.put("lock_type", IOSEnum.LOCK_TYPE.code("出库锁"));
-                iStructattrService.updateStatusByCode("0",lock_map);
+                iStructattrService.updateStatusByCode("0", lock_map);
 
                 //生成分配明细
                 ioStorInvDisMapper.insert(ioStorInvDis);
@@ -878,19 +937,24 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 iMdPbStoragevehicleextService.updateIvt(updateIvtList);
             }
 
-            //更新详情
-            dtl.setBill_status(unassign_qty==0 ? IOSEnum.BILL_STATUS.code("分配完"): IOSEnum.BILL_STATUS.code("分配中"));
+            //更新明细
+            dtl.setBill_status(unassign_qty == 0 ? IOSEnum.BILL_STATUS.code("分配完") : IOSEnum.BILL_STATUS.code("分配中"));
             double assign_qty = allocation_canuse_qty + dtl.getAssign_qty().doubleValue();
             dtl.setUnassign_qty(BigDecimal.valueOf(unassign_qty));
             dtl.setAssign_qty(BigDecimal.valueOf(assign_qty));
+            // 校验明细是否需要拣选
+            boolean is_check = checkIosDtl(dtl);
+            if (is_check) {
+                dtl.setIs_check(IOSConstant.IS_DELETE_YES);
+            }
             ioStorInvDtlMapper.updateById(dtl);
         }
 
         //更新主表
         //根据单据标识判断明细是否都已经分配完成
         int disCount = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                .eq(IOStorInvDtl::getIostorinv_id,iostorinv_id)
-                .lt(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("分配完"))
+                .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
+                .lt(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配完"))
         );
 
         // 根据分配货位情况 更新主表单据状态
@@ -899,8 +963,11 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setUpdate_optid(currentUserId);
         ios.setUpdate_optname(nickName);
         ios.setUpdate_time(now);
-        ios.setBill_status(disCount>0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
+        ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完"));
         ioStorInvMapper.updateById(ios);
+
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("叫料中"));
     }
 
     @Override
@@ -913,16 +980,16 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         String iostorinv_id = whereJson.getString("iostorinv_id");
 
         List<IOStorInvDis> ioStorInvDisList = ioStorInvDisMapper.selectList(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .le(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("未生成"))
-                .eq(IOStorInvDis::getIs_issued,BaseDataEnum.IS_YES_NOT.code("否"))
-                .eq(IOStorInvDis::getIostorinv_id,iostorinv_id)
-                .eq(IOStorInvDis::getIostorinvdis_id,whereJson.getString("iostorinvdis_id"))
+                .le(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("未生成"))
+                .eq(IOStorInvDis::getIs_issued, BaseDataEnum.IS_YES_NOT.code("否"))
+                .eq(IOStorInvDis::getIostorinv_id, iostorinv_id)
+                .eq(IOStorInvDis::getIostorinvdis_id, whereJson.getString("iostorinvdis_id"))
         );
-        if (ObjectUtil.isEmpty(ioStorInvDisList)){
+        if (ObjectUtil.isEmpty(ioStorInvDisList)) {
             throw new BadRequestException("不存在可取消的出库分配明细");
         }
 
-        for (IOStorInvDis ioStorInvDis:ioStorInvDisList){
+        for (IOStorInvDis ioStorInvDis : ioStorInvDisList) {
 
             //更新库存 减冻结加可用
             List<JSONObject> updateIvtList = new ArrayList<>();
@@ -943,24 +1010,25 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             unlock_map.put("inv_type", null);
             unlock_map.put("inv_id", null);
             unlock_map.put("inv_code", null);
-            iStructattrService.updateStatusByCode("2",unlock_map);
+            iStructattrService.updateStatusByCode("2", unlock_map);
 
             //更新出库明细单状态
             IOStorInvDtl ioStorInvDtl = ioStorInvDtlMapper.selectById(whereJson.getString("iostorinvdtl_id"));
 
             //取消分配计算 已分配 = 已分配 - 分配详情计划数量
             //    未分配 = 计划分配 - 已分配
-            double assign_qty = ioStorInvDtl.getAssign_qty().doubleValue()-ioStorInvDis.getPlan_qty().doubleValue();
-            double unassign_qty = ioStorInvDtl.getUnassign_qty().doubleValue() + (ioStorInvDtl.getPlan_qty().doubleValue()-assign_qty);
+            double assign_qty = ioStorInvDtl.getAssign_qty().doubleValue() - ioStorInvDis.getPlan_qty().doubleValue();
+            double unassign_qty = ioStorInvDtl.getUnassign_qty().doubleValue() + (ioStorInvDtl.getPlan_qty().doubleValue() - assign_qty);
             ioStorInvDtl.setAssign_qty(BigDecimal.valueOf(assign_qty));
             ioStorInvDtl.setUnassign_qty(BigDecimal.valueOf(unassign_qty));
-            if (assign_qty == 0){
+            if (assign_qty == 0) {
                 ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
-            }else if (unassign_qty == 0){
+            } else if (unassign_qty == 0) {
                 ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("分配完"));
-            }else {
+            } else {
                 ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("分配中"));
             }
+            ioStorInvDtl.setIs_check(IOSConstant.IS_DELETE_NO);
             ioStorInvDtlMapper.updateById(ioStorInvDtl);
 
             //删除出入库单分配表
@@ -971,9 +1039,9 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         //更新主表
         //根据单据标识判断明细是否都已经分配完成
         int disCount = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                .eq(IOStorInvDtl::getIostorinv_id,iostorinv_id)
-                .le(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("分配完"))
-                .gt(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("生成"))
+                .eq(IOStorInvDtl::getIostorinv_id, iostorinv_id)
+                .le(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配完"))
+                .gt(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("生成"))
         );
 
         // 根据分配货位情况 更新主表单据状态
@@ -982,8 +1050,11 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         ios.setUpdate_optid(currentUserId);
         ios.setUpdate_optname(nickName);
         ios.setUpdate_time(now);
-        ios.setBill_status(disCount>0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("生成"));
+        ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("生成"));
         ioStorInvMapper.updateById(ios);
+
+        // 更新叫料单状态
+        updateBomStatus(ios, BomEnum.CALL_BOM_STATUS.code("生成"));
     }
 
     @Override
@@ -991,7 +1062,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         //出库点
         String point_code = whereJson.getString("point_code");
 
-        if (StrUtil.isBlank(point_code)){
+        if (StrUtil.isBlank(point_code)) {
             throw new BadRequestException("未选择出库点");
         }
         String iostorinv_id = whereJson.getString("iostorinv_id");
@@ -1003,26 +1074,28 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         }
 
         List<IOStorInvDis> ioStorInvDisList = ioStorInvDisMapper.selectList(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .eq(IOStorInvDis::getIostorinv_id,iostorinv_id)
-                .eq(IOStorInvDis::getIs_issued,BaseDataEnum.IS_YES_NOT.code("否"))
-                .and(wrapper -> wrapper.isNotNull(IOStorInvDis::getStruct_code).ne(IOStorInvDis::getStruct_code,""))
+                .eq(IOStorInvDis::getIostorinv_id, iostorinv_id)
+                .eq(IOStorInvDis::getIs_issued, BaseDataEnum.IS_YES_NOT.code("否"))
+                .and(wrapper -> wrapper.isNotNull(IOStorInvDis::getStruct_code).ne(IOStorInvDis::getStruct_code, ""))
         );
-        if (ObjectUtil.isEmpty(ioStorInvDisList)){
+        if (ObjectUtil.isEmpty(ioStorInvDisList)) {
             throw new BadRequestException("当前没有可设置的分配明细");
         }
 
-        for (IOStorInvDis ioStorInvDis:ioStorInvDisList){
+        // 根据任务类创建任务
+        IOStorInv iosMstDao = ioStorInvMapper.selectById(ioStorInvDisList.get(0).getIostorinv_id());
+        for (IOStorInvDis ioStorInvDis : ioStorInvDisList) {
             //创建任务
             JSONObject task_form = new JSONObject();
             task_form.put("task_type", "STOutTask");
-            task_form.put("TaskCode",CodeUtil.getNewCode("TASK_CODE"));
-            task_form.put("PickingLocation", ioStorInvDis.getStruct_code());
-            task_form.put("PlacedLocation", point_code);
+            task_form.put("TaskCode", CodeUtil.getNewCode("TASK_CODE"));
+            task_form.put("point_code1", ioStorInvDis.getStruct_code());
+            task_form.put("point_code2", point_code);
             task_form.put("vehicle_code", ioStorInvDis.getStoragevehicle_code());
-
-            StOutTask stOutTask = SpringContextHolder.getBean("STOutTask");
-
-            String task_id = stOutTask.create(task_form);
+            task_form.put("material_id", ioStorInvDis.getMaterial_id());
+            task_form.put("material_qty", ioStorInvDis.getPlan_qty());
+            AbstractTask task = taskFactory.getTask(IOSEnum.OUT_CONFIG_CODE.code(iosMstDao.getBill_type()));
+            String task_id = task.create(task_form);
 
             //分配明细表更新任务相关数据
             IOStorInvDis dis = new IOStorInvDis();
@@ -1050,13 +1123,13 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             throw new BadRequestException("未查到相关出库单");
         }
 
-        if (!IOSEnum.BILL_STATUS.code("分配完").equals(ioStorInv.getBill_status())){
+        if (!IOSEnum.BILL_STATUS.code("分配完").equals(ioStorInv.getBill_status())) {
             throw new BadRequestException("主表状态必须为分配完！");
         }
 
         //解锁原货位点位
         List<IOStorInvDis> storInvDisList = ioStorInvDisMapper.selectList(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .eq(IOStorInvDis::getIostorinv_id,whereJson.get("iostorinv_id"))
+                .eq(IOStorInvDis::getIostorinv_id, whereJson.get("iostorinv_id"))
         );
 
         // 判断此单据下的所有任务有没有完成的
@@ -1072,35 +1145,28 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             throw new BadRequestException("当前有未完成的任务不能强制确认!");
         }
 
-        //需要更新的出入库单明细
+        //需要更新的出出库单明细
         Set<String> dtlSet = new HashSet<>();
 
-        for (IOStorInvDis ioStorInvDis: storInvDisList){
-            if (StrUtil.isNotBlank(ioStorInvDis.getStruct_code())){
+        for (IOStorInvDis ioStorInvDis : storInvDisList) {
+            if (StrUtil.isNotBlank(ioStorInvDis.getStruct_code())) {
                 //解绑仓位
                 JSONObject finish_map = new JSONObject();
-                finish_map.put("struct_code",ioStorInvDis.getStruct_code());
-                finish_map.put("storagevehicle_code",null);
+                finish_map.put("struct_code", ioStorInvDis.getStruct_code());
+                finish_map.put("storagevehicle_code", null);
                 finish_map.put("inv_type", null);
                 finish_map.put("inv_id", null);
                 finish_map.put("inv_code", null);
-                iStructattrService.updateStatusByCode("1",finish_map);
-
-                //库存绑定到出库点。
-                schBasePointMapper.update(new SchBasePoint(),new LambdaUpdateWrapper<>(SchBasePoint.class)
-                        .set(SchBasePoint::getVehicle_code,ioStorInvDis.getStoragevehicle_code())
-                        .set(SchBasePoint::getIos_id,ioStorInvDis.getIostorinvdis_id())
-                        .eq(SchBasePoint::getPoint_code,ioStorInvDis.getPoint_code())
-                );
+                iStructattrService.updateStatusByCode("1", finish_map);
 
                 //修改库存 减冻结加可用
                 List<JSONObject> updateIvtList = new ArrayList<>();
                 JSONObject jsonIvt = new JSONObject();
 
                 //判断分配明细是否分配了出库点位和任务号 分配则恢复库存等待手持减扣 没分配则减扣库存
-                if (StrUtil.isNotBlank(ioStorInvDis.getPoint_code()) && StrUtil.isNotBlank(ioStorInvDis.getTask_id())){
+                if (StrUtil.isNotBlank(ioStorInvDis.getPoint_code()) && StrUtil.isNotBlank(ioStorInvDis.getTask_id())) {
                     jsonIvt.put("type", IOSConstant.UPDATE_IVT_TYPE_SUB_FROZEN_ADD_CANUSE);
-                }else {
+                } else {
                     jsonIvt.put("type", IOSConstant.UPDATE_IVT_TYPE_SUB_FROZEN);
                 }
                 jsonIvt.put("storagevehicle_code", ioStorInvDis.getStoragevehicle_code());
@@ -1114,40 +1180,40 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
             }
 
             //更新分配明细数据
-            ioStorInvDisMapper.update(ioStorInvDis,new LambdaUpdateWrapper<>(IOStorInvDis.class)
-                    .set(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("完成"))
-                    .set(IOStorInvDis::getReal_qty,BigDecimal.ZERO)
-                    .eq(IOStorInvDis::getIostorinvdis_id,ioStorInvDis.getIostorinvdis_id())
-                    .ne(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("完成"))
+            ioStorInvDisMapper.update(ioStorInvDis, new LambdaUpdateWrapper<>(IOStorInvDis.class)
+                    .set(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
+                    .set(IOStorInvDis::getReal_qty, BigDecimal.ZERO)
+                    .eq(IOStorInvDis::getIostorinvdis_id, ioStorInvDis.getIostorinvdis_id())
+                    .ne(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
             );
 
             //添加需要更新的明细标识
             dtlSet.add(ioStorInvDis.getIostorinvdtl_id());
 
             //更新组盘记录表
-            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())
+            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())
             );
         }
 
         //更新出库明细单状态
-        for (String dtlId:dtlSet){
-            ioStorInvDtlMapper.update(new IOStorInvDtl(),new LambdaUpdateWrapper<>(IOStorInvDtl.class)
-                    .set(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("完成"))
-                    .set(IOStorInvDtl::getReal_qty,BigDecimal.ZERO)
-                    .eq(IOStorInvDtl::getIostorinvdtl_id,dtlId)
+        for (String dtlId : dtlSet) {
+            ioStorInvDtlMapper.update(new IOStorInvDtl(), new LambdaUpdateWrapper<>(IOStorInvDtl.class)
+                    .set(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+                    .set(IOStorInvDtl::getReal_qty, BigDecimal.ZERO)
+                    .eq(IOStorInvDtl::getIostorinvdtl_id, dtlId)
             );
         }
 
         //更新主表状态
-        ioStorInvMapper.update(ioStorInv,new LambdaUpdateWrapper<>(IOStorInv.class)
-                .set(IOStorInv::getBill_status,IOSEnum.BILL_STATUS.code("完成"))
-                .set(IOStorInv::getConfirm_optid,currentUserId)
-                .set(IOStorInv::getConfirm_optname,nickName)
-                .set(IOStorInv::getConfirm_time,now)
-                .eq(IOStorInv::getIostorinv_id,whereJson.get("iostorinv_id"))
+        ioStorInvMapper.update(ioStorInv, new LambdaUpdateWrapper<>(IOStorInv.class)
+                .set(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+                .set(IOStorInv::getConfirm_optid, currentUserId)
+                .set(IOStorInv::getConfirm_optname, nickName)
+                .set(IOStorInv::getConfirm_time, now)
+                .eq(IOStorInv::getIostorinv_id, whereJson.get("iostorinv_id"))
         );
     }
 
@@ -1166,26 +1232,27 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         String now = DateUtil.now();
 
         IOStorInvDis ioStorInvDis = ioStorInvDisMapper.selectOne(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .eq(IOStorInvDis::getTask_id,task.getTask_id())
+                .eq(IOStorInvDis::getTask_id, task.getTask_id())
         );
-        if (ObjectUtil.isEmpty(ioStorInvDis)){
+        if (ObjectUtil.isEmpty(ioStorInvDis)) {
             throw new BadRequestException("未找到任务对应的分配明细");
         }
 
         // 完成当前分配明细
-        ioStorInvDisMapper.update(ioStorInvDis,new LambdaUpdateWrapper<>(IOStorInvDis.class)
-                .set(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("完成"))
-                .eq(IOStorInvDis::getIostorinvdis_id,ioStorInvDis.getIostorinvdis_id())
+        ioStorInvDisMapper.update(ioStorInvDis, new LambdaUpdateWrapper<>(IOStorInvDis.class)
+                .set(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
+                .set(IOStorInvDis::getReal_qty, task.getMaterial_qty())
+                .eq(IOStorInvDis::getIostorinvdis_id, ioStorInvDis.getIostorinvdis_id())
         );
 
         //解锁库位
         JSONObject finish_map = new JSONObject();
-        finish_map.put("struct_code",ioStorInvDis.getStruct_code());
-        finish_map.put("storagevehicle_code",null);
+        finish_map.put("struct_code", ioStorInvDis.getStruct_code());
+        finish_map.put("storagevehicle_code", null);
         finish_map.put("inv_type", null);
         finish_map.put("inv_id", null);
         finish_map.put("inv_code", null);
-        iStructattrService.updateStatusByCode("1",finish_map);
+        iStructattrService.updateStatusByCode("1", finish_map);
 
         //修改库存 恢复库存 手持进行减扣
         List<JSONObject> updateIvtList = new ArrayList<>();
@@ -1200,58 +1267,117 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
         updateIvtList.add(jsonIvt);
         iMdPbStoragevehicleextService.updateIvt(updateIvtList);
 
-        //库存绑定到出库点。
-        schBasePointMapper.update(new SchBasePoint(),new LambdaUpdateWrapper<>(SchBasePoint.class)
-                .set(SchBasePoint::getVehicle_code,ioStorInvDis.getStoragevehicle_code())
-                .set(SchBasePoint::getIos_id,ioStorInvDis.getIostorinvdis_id())
-                .eq(SchBasePoint::getPoint_code,ioStorInvDis.getPoint_code())
-        );
-
         // 判断是否是整出
         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())
+            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())
             );
         }
 
         // 查询该明细下是否还有未完成的分配明细
         int countDis = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class)
-                .eq(IOStorInvDis::getIostorinvdtl_id,ioStorInvDis.getIostorinvdtl_id())
-                .ne(IOStorInvDis::getWork_status,IOSEnum.INBILL_DIS_STATUS.code("完成"))
+                .eq(IOStorInvDis::getIostorinvdtl_id, ioStorInvDis.getIostorinvdtl_id())
+                .ne(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
         );
 
         // 明细
         IOStorInvDtl ioStorInvDtl = ioStorInvDtlMapper.selectById(ioStorInvDis.getIostorinvdtl_id());
-        if (ObjectUtil.isEmpty(ioStorInvDtl)){
+        if (ObjectUtil.isEmpty(ioStorInvDtl)) {
             throw new BadRequestException("未找到明细");
         }
         // 如果分配明细全部完成则更新明细表状态
-        if (countDis == 0){
+        if (countDis == 0) {
             // 更新明细表状态
             ioStorInvDtl.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
+            ioStorInvDtl.setReal_qty(ioStorInvDtl.getAssign_qty());
+            // 如果是领料出库单则更新工单状态以及实际出库重量
+            if (ObjectUtil.isNotEmpty(ioStorInvDtl.getSource_bill_code())) {
+                PdmBomCallMaterial callMaterDao = iPdmBomCallMaterialService.findByCode(ioStorInvDtl.getSource_bill_code());
+                callMaterDao.setReal_qty(ioStorInvDtl.getPlan_qty());
+                callMaterDao.setBom_status(BomEnum.CALL_BOM_STATUS.code("叫料完成"));
+                iPdmBomCallMaterialService.updateById(callMaterDao);
+            }
             ioStorInvDtlMapper.updateById(ioStorInvDtl);
 
             // 查看明细是否全部完成
             int countDtl = ioStorInvDtlMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDtl.class)
-                    .eq(IOStorInvDtl::getIostorinv_id,ioStorInvDtl.getIostorinv_id())
-                    .ne(IOStorInvDtl::getBill_status,IOSEnum.BILL_STATUS.code("完成"))
+                    .eq(IOStorInvDtl::getIostorinv_id, ioStorInvDtl.getIostorinv_id())
+                    .ne(IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
             );
 
             // 如果明细全部完成则更新主表状态
-            if (countDtl == 0){
+            if (countDtl == 0) {
                 //更新主表状态
-                ioStorInvMapper.update(new IOStorInv(),new LambdaUpdateWrapper<>(IOStorInv.class)
-                        .set(IOStorInv::getBill_status,IOSEnum.BILL_STATUS.code("完成"))
-                        .set(IOStorInv::getConfirm_optid,currentUserId)
-                        .set(IOStorInv::getConfirm_optname,nickName)
-                        .set(IOStorInv::getConfirm_time,now)
-                        .eq(IOStorInv::getIostorinv_id,ioStorInvDtl.getIostorinv_id())
+                ioStorInvMapper.update(new IOStorInv(), new LambdaUpdateWrapper<>(IOStorInv.class)
+                        .set(IOStorInv::getBill_status, IOSEnum.BILL_STATUS.code("完成"))
+                        .set(IOStorInv::getConfirm_optid, currentUserId)
+                        .set(IOStorInv::getConfirm_optname, nickName)
+                        .set(IOStorInv::getConfirm_time, now)
+                        .eq(IOStorInv::getIostorinv_id, ioStorInvDtl.getIostorinv_id())
                 );
             }
         }
     }
 
+    /**
+     * 更新叫料单状态
+     *
+     * @param ios        主表实体类
+     * @param bom_status 变更状态
+     */
+    private void updateBomStatus(IOStorInv ios, String bom_status) {
+        List<String> sourceList = ioStorInvDtlMapper.selectList(
+                new QueryWrapper<IOStorInvDtl>().lambda()
+                        .eq(IOStorInvDtl::getIostorinv_id, ios.getIostorinv_id())
+                        .in(bom_status.equals(IOSConstant.TWO), IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("分配中")
+                                , IOSEnum.BILL_STATUS.code("分配完")
+                        )
+                        .in(bom_status.equals(IOSConstant.IS_DELETE_YES), IOStorInvDtl::getBill_status, IOSEnum.BILL_STATUS.code("生成"))
+        ).stream().map(IOStorInvDtl::getSource_bill_code)
+                .collect(Collectors.toList());
+
+        if (ObjectUtil.isEmpty(sourceList)) {
+            return;
+        }
+        iPdmBomCallMaterialService.update(
+                new UpdateWrapper<PdmBomCallMaterial>().lambda()
+                        .in(PdmBomCallMaterial::getBom_code, sourceList)
+                        .set(PdmBomCallMaterial::getBom_status, bom_status)
+        );
+    }
+
+    /**
+     * 校验明细是否需要拣选
+     *
+     * @param dtl 明细实体类
+     */
+    private boolean checkIosDtl(IOStorInvDtlDto dtl) {
+        IOStorInv iosMst = this.getById(dtl.getIostorinv_id());
+        if (iosMst.getBill_type().equals(IOSEnum.OUT_BILL_TYPE.code("退货出库"))
+                || iosMst.getBill_type().equals(IOSEnum.OUT_BILL_TYPE.code("手工出库"))
+        ) {
+            return false;
+        }
+
+        /*
+         *  1.领料出库：焊丝（盘状）= 整出 领料出库：焊丝（棒状）= 拣选
+         *  2.已分配重量小于/等于计划重量 = 整出；已分配重量大于计划重量 = 拣选
+         */
+        // 如果是领料出库，并且是焊丝（盘状）则整出
+        if (iosMst.getBill_type().equals(IOSEnum.OUT_BILL_TYPE.code("领料出库"))) {
+            if (dtl.getMaterial_id().equals(IOSConstant.MATERIAL_HS_PZ)) {
+                return false;
+            }
+        }
+
+        // 判断已分配数量和计划数量: 已分配重量大于计划重量 = 拣选
+        if (dtl.getAssign_qty().doubleValue() > dtl.getPlan_qty().doubleValue()) {
+            return true;
+        }
+        return false;
+    }
+
 }
diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue
index bd06dcc..fdb849e 100644
--- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue
+++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue
@@ -10,6 +10,15 @@
           label-width="80px"
           label-suffix=":"
         >
+          <el-form-item label="单据编码">
+            <el-input
+              v-model="query.bom_code"
+              clearable
+              size="mini"
+              placeholder="单据编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="物料编码">
             <el-input
               v-model="query.material_code"
@@ -108,12 +117,15 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
+        <el-table-column prop="bom_code" label="工单单号" :min-width="flexWidth('bom_code',crud.data,'工单单号')" />
         <el-table-column prop="bom_status" label="工单状态" :formatter="formattStatus" :min-width="flexWidth('bom_status',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="device_code" label="机台编码" :min-width="flexWidth('device_code',crud.data,'机台编码')" />
-        <el-table-column prop="call_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="call_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="real_weigh_qty" label="实际用料重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
         <el-table-column prop="create_name" label="叫料人" :min-width="flexWidth('create_name',crud.data,'叫料人')" />
         <el-table-column prop="create_time" label="叫料时间" :min-width="flexWidth('create_time',crud.data,'叫料时间')" />
         <el-table-column prop="confirm_time" label="结束时间" :min-width="flexWidth('confirm_time',crud.data,'结束时间')" />
@@ -150,6 +162,7 @@ import rrOperation from '@crud/RR.operation'
 import crudGroup from '@/views/wms/basedata/group/group'
 
 const defaultForm = {
+  bom_code: null,
   material_spec: null,
   material_name: null,
   material_code: null,
diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index 03029a6..c3217f3 100644
--- a/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -118,7 +118,17 @@
           size="mini"
           @click="queryDtl()"
         >
-          添加物料
+          添加库内库存
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtlIos()"
+        >
+          添加叫料单据
         </el-button>
       </span>
 
@@ -153,6 +163,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
+      <el-table-column prop="source_bill_code" label="来源单据号" align="center" min-width="150px" show-overflow-tooltip />
       <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
         <template scope="scope">
           <el-input v-model="scope.row.remark" size="mini" />
@@ -167,14 +178,14 @@
     </el-table>
 
     <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
-<!--    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />-->
+    <AddDtlIos :dialog-show.sync="dtlIosShow" @tableChanged="tableChanged2" />
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/st/outbill/AddDtl'
-import MaterDialog from '@/views/wms/pub/MaterDialog'
+import AddDtlIos from '@/views/wms/st/outbill/AddDtlIos'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
 
@@ -195,7 +206,7 @@ const defaultForm = {
 }
 export default {
   name: 'AddDialog',
-  components: { AddDtl, MaterDialog },
+  components: { AddDtl, AddDtlIos },
   mixins: [crud(), form(defaultForm)],
   props: {
     dialogShow: {
@@ -208,6 +219,7 @@ export default {
     return {
       dialogVisible: false,
       dtlShow: false,
+      dtlIosShow: false,
       materType: '',
       materShow: false,
       flagnow: false,
@@ -319,6 +331,17 @@ export default {
       this.storId = this.form.stor_id
       this.dtlShow = true
     },
+    queryDtlIos(index, row) {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.stor_id === '') {
+        this.crud.notify('请选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.dtlIosShow = true
+    },
     tableChanged(rows) {
       rows.forEach((item) => {
         // 添加plan_qty
@@ -343,6 +366,31 @@ export default {
       })
       this.form.detail_count = this.form.tableData.length
     },
+    tableChanged2(rows) {
+      rows.forEach((item) => {
+        // 添加plan_qty
+        item.plan_qty = item.call_qty
+        item.source_bill_code = item.bom_code
+        if (this.form.tableData.length !== 0) {
+          this.flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].storagevehicle_code === item.storagevehicle_code && this.form.tableData[i].pcsn === item.pcsn) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            item.edit = true
+            this.form.tableData.splice(-1, 0, item)
+            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+          }
+        } else {
+          item.edit = true
+          this.form.tableData.splice(-1, 0, item)
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+        }
+      })
+      this.form.detail_count = this.form.tableData.length
+    },
     setMaterValue(row) {
       for (let i = 0; i < this.form.tableData.length; i++) {
         if (this.form.tableData[i].material_id === row.material_id) {
diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue b/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue
new file mode 100644
index 0000000..a1aaf96
--- /dev/null
+++ b/wms/nladmin-ui/src/views/wms/st/outbill/AddDtlIos.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-dialog
+    title="单据选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <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.bom_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-input
+          v-model="query.device_code"
+          clearable
+          size="mini"
+          placeholder="机台编码"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+    <!--表格渲染-->
+    <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="bom_code" label="工单单号" :min-width="flexWidth('bom_code',crud.data,'工单单号')" />
+      <el-table-column prop="bom_status" label="工单状态" :formatter="formattStatus" :min-width="flexWidth('bom_status',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="device_code" label="机台编码" :min-width="flexWidth('device_code',crud.data,'机台编码')" />
+      <el-table-column prop="call_qty" label="叫料重量" :formatter="crud.formatNum3" :min-width="100" />
+      <el-table-column prop="create_name" label="叫料人" :min-width="flexWidth('create_name',crud.data,'叫料人')" />
+      <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_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, 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: 'AddDtlIos',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '叫料单据',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      url: 'api/bomCallMaterial',
+      query: { 'bom_status': '1' },
+      idField: 'bom_id',
+      sort: 'bom_id,desc'
+    })
+  },
+  mixins: [presenter(), header()],
+  dicts: ['BOM_STATUS'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    formattStatus(row) {
+      return this.dict.label.BOM_STATUS[row.bom_status]
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+
diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
index 5d07487..14b90b9 100644
--- a/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -23,7 +23,7 @@
       <span class="role-span">出库明细</span>
       <div class="crud-opts-form">
         <el-form ref="form" :inline="true" :model="form" size="mini">
-          <el-form-item label="库区" prop="gender2">
+        <!--  <el-form-item label="库区" prop="gender2">
             <el-cascader
               placeholder="请选择"
               :options="sects"
@@ -31,7 +31,7 @@
               clearable
               @change="sectQueryChange"
             />
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
       </div>
       <span class="crud-opts-right2">
@@ -131,6 +131,8 @@
         <el-table-column show-overflow-tooltip prop="plan_qty" label="数量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配数量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配数量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column prop="source_bill_code" label="来源单据号" align="center" min-width="150px" show-overflow-tooltip />
+        <el-table-column prop="is_check" label="是否拣选" align="center" min-width="100px" show-overflow-tooltip :formatter="isCheck" />
       </el-table>
     </el-card>
     <div class="crud-opts2">
@@ -297,7 +299,7 @@ export default {
       sects: [],
       pointList: [],
       rules: {
-      },
+      }
     }
   },
   watch: {
@@ -324,7 +326,7 @@ export default {
         this.sects = res.content
       })
 
-      const area_type = 'OUT01'
+      const area_type = 'INOUR01'
       crudPoint.getPointList({ 'region_code': area_type }).then(res => {
         this.pointList = res
       })
@@ -338,6 +340,9 @@ export default {
     bill_statusFormat(row, column) {
       return this.dict.label.io_bill_status[row.bill_status]
     },
+    isCheck(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_check]
+    },
     PointChanged(row) {
       this.form2.point_code = row.point_code
     },
diff --git a/wms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/wms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index b7ee1fb..106bfe1 100644
--- a/wms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/wms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -134,6 +134,7 @@
         <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" width="100px" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
         <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
+        <el-table-column prop="is_check" label="是否拣选" align="center" min-width="100px" show-overflow-tooltip :formatter="isCheck" />
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
       </el-table>
     </el-card>
@@ -237,6 +238,9 @@ export default {
     taskdtl_typeFormat(row) {
       return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
     },
+    isCheck(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_check]
+    },
     formatOverdue(row, column) {
       return this.dict.label.IS_OR_NOT[row.is_overdue]
     },