diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/aps_manage/mps.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/aps_manage/mps.xls
index f0615451..27cdf427 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/aps_manage/mps.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/aps_manage/mps.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java
new file mode 100644
index 00000000..057e7975
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.mps_manage.ordermanage.controller.saleOrder;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 生产订单表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+@RestController
+@RequestMapping("/mpsSaleOrder")
+public class MpsSaleOrderController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
new file mode 100644
index 00000000..ed3e74c5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.mps_manage.ordermanage.service.saleOrder;
+
+import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 生产订单表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+public interface IMpsSaleOrderService extends IService<MpsSaleOrder> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java
new file mode 100644
index 00000000..2244a6dc
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java
@@ -0,0 +1,165 @@
+package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 生产订单表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("mps_sale_order")
+public class MpsSaleOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 销售单标识
+     */
+    private Long sale_id;
+
+    /**
+     * 销售单号
+     */
+    private String sale_code;
+
+    /**
+     * 明细序号
+     */
+    private BigDecimal seq_no;
+
+    /**
+     * 销售单类型
+     */
+    private String sale_type;
+
+    /**
+     * 物料标识
+     */
+    private Long material_id;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 销售数量
+     */
+    private BigDecimal sale_qty;
+
+    /**
+     * 生产顺序
+     */
+    private BigDecimal produce_seq;
+
+    /**
+     * 客户标识
+     */
+    private Long cust_id;
+
+    /**
+     * 客户编码
+     */
+    private String cust_code;
+
+    /**
+     * 客户名称
+     */
+    private String cust_name;
+
+    /**
+     * 计量单位标识
+     */
+    private Long qty_unit_id;
+
+    /**
+     * 计划交期
+     */
+    private String plandeliver_date;
+
+    /**
+     * 创建人
+     */
+    private Long create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    /**
+     * 提交人
+     */
+    private Long audit_optid;
+
+    /**
+     * 提交时间
+     */
+    private String audit_time;
+
+    /**
+     * 提交人姓名
+     */
+    private String audit_optname;
+
+    /**
+     * 确认人
+     */
+    private Long confirm_optid;
+
+    /**
+     * 确认人姓名
+     */
+    private String confirm_optname;
+
+    /**
+     * 确认时间
+     */
+    private String confirm_time;
+
+    /**
+     * 是否删除
+     */
+    private String is_delete;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 车间标识
+     */
+    private Long workshop_id;
+
+    /**
+     * 生产数量
+     */
+    private BigDecimal product_qty;
+
+    /**
+     * 预入库数量
+     */
+    private BigDecimal instor_qty;
+
+    /**
+     * 发货数量
+     */
+    private BigDecimal sendout_qty;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
new file mode 100644
index 00000000..a8480826
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.mapper;
+
+import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产订单表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+public interface MpsSaleOrderMapper extends BaseMapper<MpsSaleOrder> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
new file mode 100644
index 00000000..6fc43f10
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
@@ -0,0 +1,5 @@
+<?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.mps_manage.ordermanage.service.saleOrder.dao.mapper.MpsSaleOrderMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
new file mode 100644
index 00000000..6df31f6d
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.mps_manage.ordermanage.service.saleOrder.impl;
+
+import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder;
+import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.mapper.MpsSaleOrderMapper;
+import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 生产订单表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+@Service
+public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper, MpsSaleOrder> implements IMpsSaleOrderService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
new file mode 100644
index 00000000..78cc2ece
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
@@ -0,0 +1,74 @@
+package org.nl.wms.storage_manage.productmanage.controller.iostorInv;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpOutService;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "成品出库")
+@RequestMapping("/api/productOut")
+@Slf4j
+public class IStivtlostorivnCpOutController {
+
+    @Autowired
+    private IStIvtIostorinvCpOutService iStIvtIostorinvCpOutService;
+
+    @GetMapping
+    @Log("查询出库单")
+    @ApiOperation("查询出库单")
+    public ResponseEntity<Object> query(IostorInvQuery query, PageQuery page){
+        return new ResponseEntity<>(iStIvtIostorinvCpOutService.pageQuery(query,page),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("创建出库单")
+    @ApiOperation("创建出库单")
+    public ResponseEntity<Object> create(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpOutService.create(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/update")
+    @Log("修改出库单")
+    @ApiOperation("修改出库单")
+    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson){
+        iStIvtIostorinvCpOutService.update(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/delete")
+    @Log("删除出库单")
+    @ApiOperation("删除出库单")
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids){
+        iStIvtIostorinvCpOutService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/getIosInvDtl")
+    @Log("获取明细")
+    @ApiOperation("获取明细")
+    public ResponseEntity<Object> getIosInvDtl(@RequestBody JSONObject whereJson){
+        return new ResponseEntity<>(iStIvtIostorinvCpOutService.getIosInvDtl(whereJson),HttpStatus.OK);
+    }
+
+    @PostMapping("/getIosInvDis")
+    @Log("获取分配明细")
+    @ApiOperation("获取明细")
+    public ResponseEntity<Object> getIosInvDis(@RequestBody JSONObject whereJson){
+        return new ResponseEntity<>(iStIvtIostorinvCpOutService.getIosInvDis(whereJson),HttpStatus.OK);
+    }
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
new file mode 100644
index 00000000..7361207f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
@@ -0,0 +1,86 @@
+package org.nl.wms.storage_manage.productmanage.service.iostorInv;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出库单主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+public interface IStIvtIostorinvCpOutService extends IService<StIvtIostorinvCp> {
+
+    /**
+     * 分页查询
+     * @param query,page /
+     * @return JSONObject
+     */
+    Object pageQuery(IostorInvQuery query, PageQuery page);
+
+    /**
+     * 创建
+     * @param form /
+     */
+    void create(JSONObject form);
+
+    /**
+     * 更新相关联的表
+     * @param form /
+     */
+    void update(JSONObject form);
+
+    /**
+     *  查询出出库单明细
+     * @param whereJson
+     * {
+     *     "bill_code": 单据号
+     *     "iostorinv_id": 主表标识
+     * }
+     * @return List
+     * {
+     *     "明细表所有字段"
+     *     "material_code": 物料编码
+     *     "material_name": 物料名称
+     *     "material_spec": 物料批次
+     * }
+     */
+    List getIosInvDtl(JSONObject whereJson);
+
+    /**
+     *  查询出出库单分配明细
+     * @param whereJson
+     * {
+     *     "iostorinvdtl_id": 明细表标识
+     *     "iostorinv_id": 主表标识
+     * }
+     *
+     * @return List
+     * {
+     *     "分配表所有字段"
+     *     "bucketunique":箱号
+     *     "qty": 数量
+     *     "material_code": 物料编码
+     *     "material_name": 物料名称
+     *     "material_spec": 物料批次
+     * }
+     */
+    List getIosInvDis(JSONObject whereJson);
+
+    /**
+     * 删除
+     * @param ids
+     * {
+     *     主表id..
+     * }
+     */
+    void delete(Long[] ids);
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
new file mode 100644
index 00000000..464f5718
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -0,0 +1,275 @@
+package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.jsonwebtoken.lang.Assert;
+import org.jetbrains.annotations.NotNull;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.publish.event.PointEvent;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService;
+import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService;
+import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
+import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord;
+import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext;
+import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
+import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
+import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
+import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
+import org.nl.wms.storage_manage.IOSEnum;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.*;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdisCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdisdtlCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdtlCp;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.mapper.StIvtIostorinvCpMapper;
+import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
+import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService;
+import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
+import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
+import org.nl.wms.storage_manage.productmanage.util.RuleUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 出库单主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+@Service
+public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCpMapper, StIvtIostorinvCp> implements IStIvtIostorinvCpOutService {
+
+    @Autowired
+    protected IStIvtIostorinvdtlCpService iostorinvdtlCpService; // 成品出入库明细表服务
+
+    @Autowired
+    protected IStIvtIostorinvdisCpService iostorinvdisCpService; // 成品出入库分配表服务
+
+    @Autowired
+    protected IStIvtIostorinvdisdtlCpService iStIvtIostorinvdisdtlCpService; // 成品出入库分配明细表服务
+
+    @Autowired
+    protected IStIvtBsrealstorattrService stIvtBsrealstorattrService; // 实物属性表表服务
+
+    @Autowired
+    protected IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; // 载具信息表服务
+
+    @Autowired
+    protected IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务
+
+    @Autowired
+    protected DivRuleCpService divRuleCpService; // 成品分配规则服务类
+
+    @Autowired
+    protected IStIvtStructattrService iStIvtStructattrService; // 仓位属性服务
+
+    @Autowired
+    private ISchBaseTaskService iSchBaseTaskService; // 任务表服务
+
+    @Autowired
+    private ISchBasePointService iSchBasePointService; // 点位服务
+
+    @Autowired
+    private IStIvtStructivtCpService iStIvtStructivtCpService; // 库存服务
+
+    @Autowired
+    protected IMdPbBucketrecordService iMdPbBucketrecordService; // 包装箱记录表服务
+
+    @Override
+    public Object pageQuery(IostorInvQuery query, PageQuery page) {
+        // 查询条件
+        query.setIo_type(IOSEnum.IO_TYPE.code("出库"));
+        page.setSort("bill_code,DESC");
+
+        // 分页查询
+        Page<StIvtIostorinvCp> pageQuery = this.page(page.build(), query.build());
+        TableDataInfo<StIvtIostorinvCp> build = TableDataInfo.build(pageQuery);
+
+        return build;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(JSONObject form) {
+
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
+
+        // 调用主表 插入/更新方法
+        StIvtIostorinvCp stIvtIostorinvCp = packageMstForm(new StIvtIostorinvCp(), form, false);
+        // 插入主表
+        this.save(stIvtIostorinvCp);
+
+        // 调用明细表 插入/更新方法
+        iostorinvdtlCpService.create(rows, stIvtIostorinvCp.getIostorinv_id());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(JSONObject form) {
+
+        JSONArray rows = form.getJSONArray("tableData");
+        if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("明细不能为空");
+
+        StIvtIostorinvCp iostorinvCp = this.getOne(new QueryWrapper<StIvtIostorinvCp>().eq("iostorinv_id", form.getString("iostorinv_id")));
+        packageMstForm(iostorinvCp,form,true);
+
+        //创建明细
+        iostorinvdtlCpService.create(rows, iostorinvCp.getIostorinv_id());
+        // 更新主表
+        this.updateById(iostorinvCp);
+    }
+
+
+    @Override
+    public List getIosInvDtl(JSONObject whereJson) {
+        // 查询主表明细
+        List<Map> maps = iostorinvdtlCpService.queryInvDtlByInv(whereJson);
+        return maps;
+    }
+
+    @Override
+    public List getIosInvDis(JSONObject whereJson) {
+
+        // 查询分配表
+        List<Map> maps = iostorinvdisCpService.queryInvDisByInvdtl(whereJson);
+        return maps;
+
+    }
+
+
+    @Override
+    public void delete(Long[] ids) {
+
+        for (Long id : ids) {
+            StIvtIostorinvCp dao = this.getOne(new QueryWrapper<StIvtIostorinvCp>().eq("iostorinv_id", id));
+            dao.setIs_delete(true);
+
+            this.updateById(dao);
+        }
+    }
+
+
+    @NotNull
+    private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
+        JSONArray rows = whereJson.getJSONArray("tableData");
+        if (!isUpdate){
+            // 新增
+            stIvtIostorinvCp.setIostorinv_id(IdUtil.getStringId());
+            stIvtIostorinvCp.setBill_code(CodeUtil.getNewCode("IO_CODE"));
+            stIvtIostorinvCp.setIo_type(IOSEnum.IO_TYPE.code("出库"));
+            stIvtIostorinvCp.setBuss_type(whereJson.getString("bill_type"));
+            stIvtIostorinvCp.setBill_type(stIvtIostorinvCp.getBuss_type());
+            stIvtIostorinvCp.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+            stIvtIostorinvCp.setCreate_id(SecurityUtils.getCurrentUserId());
+            stIvtIostorinvCp.setCreate_name(SecurityUtils.getCurrentNickName());
+            stIvtIostorinvCp.setCreate_time(new Date());
+            stIvtIostorinvCp.setIs_delete(false);
+            // TODO 暂时写死
+            stIvtIostorinvCp.setSysdeptid("111");
+            stIvtIostorinvCp.setSyscompanyid("111");
+        }else {
+            
+            // 修改
+            stIvtIostorinvCp.setUpdate_id(SecurityUtils.getCurrentUserId());
+            stIvtIostorinvCp.setUpdate_name(SecurityUtils.getCurrentNickName());
+            stIvtIostorinvCp.setUpdate_time(new Date());
+        }
+
+        stIvtIostorinvCp.setBiz_date(whereJson.getString("biz_date").substring(0,10));
+        // 获取仓库信息
+        QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(StIvtBsrealstorattr::getStor_id,whereJson.getString("stor_id"))
+                .eq(StIvtBsrealstorattr::getIs_used, true);
+
+        StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper);
+        if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！");
+
+        stIvtIostorinvCp.setStor_id(bsrealDao.getStor_id());
+        stIvtIostorinvCp.setStor_code(bsrealDao.getStor_code());
+        stIvtIostorinvCp.setStor_name(bsrealDao.getStor_name());
+        stIvtIostorinvCp.setTotal_qty(whereJson.getBigDecimal("total_qty"));
+        stIvtIostorinvCp.setDetail_count(rows.size());
+        stIvtIostorinvCp.setRemark(whereJson.getString("remark"));
+
+        return stIvtIostorinvCp;
+    }
+
+    @NotNull
+    public void updateMst(String iostorinv_id) {
+        /*
+            更新主表
+         */
+
+        StIvtIostorinvCp mstDao = this.baseMapper.selectOne(
+                new QueryWrapper<StIvtIostorinvCp>().lambda()
+                        .eq(StIvtIostorinvCp::getIostorinv_id, iostorinv_id)
+        );
+        mstDao.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mstDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+        mstDao.setUpdate_time(new Date());
+        mstDao.setDis_id(SecurityUtils.getCurrentUserId());
+        mstDao.setDis_name(SecurityUtils.getCurrentNickName());
+        mstDao.setDis_time(DateUtil.now());
+
+        // 查询主表下所有明细
+        List<StIvtIostorinvdtlCp> dtlDaoList = iostorinvdtlCpService.list(
+                new QueryWrapper<StIvtIostorinvdtlCp>().lambda()
+                        .eq(StIvtIostorinvdtlCp::getIostorinv_id, iostorinv_id)
+        );
+
+        // 判断是否都为分配完
+        boolean is_true = dtlDaoList
+                .stream()
+                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("分配完")));
+
+        if (is_true) {
+            // 更新主表为分配完
+            mstDao.setBill_status(IOSEnum.BILL_STATUS.code("分配完"));
+        } else {
+            // 更新主表为分配中
+            mstDao.setBill_status(IOSEnum.BILL_STATUS.code("分配中"));
+        }
+
+        // 判断是否为生成
+        boolean is_create = dtlDaoList
+                .stream()
+                .allMatch(row -> row.getBill_status().equals(IOSEnum.BILL_STATUS.code("生成")));
+
+        if (is_create) mstDao.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+
+        this.updateById(mstDao);
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index 72586305..67644810 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -389,8 +389,10 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         iStIvtStructattrService.updateById(attrDao);
 
         // 4.更新库存
+        StIvtIostorinvdtlCp dtlDao = iostorinvdtlCpService.getById(disDao.getIostorinvdtl_id());
+
         disDao.setStruct_id(attrDao.getStruct_id());
-        iStIvtStructivtCpService.UpdateIvt(ivtDataParam(disDao,ChangeIvtUtil.ADDWAREHOUSING_QTY));
+        iStIvtStructivtCpService.UpdateIvt(ivtDataParam(disDao,ChangeIvtUtil.ADDWAREHOUSING_QTY,dtlDao.getSource_billdtl_id()));
 
     }
 
@@ -448,7 +450,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         );
 
         // 更新库存
-        iStIvtStructivtCpService.UpdateIvt(ivtDataParam(disDao,ChangeIvtUtil.SUBWAREHOUSING_QTY));
+        iStIvtStructivtCpService.UpdateIvt(ivtDataParam(disDao,ChangeIvtUtil.SUBWAREHOUSING_QTY,null));
 
         // 4.更新分配
         iostorinvdisCpService.updateById(
@@ -585,7 +587,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
             }
 
             // 2）更新库存
-            iStIvtStructivtCpService.UpdateIvt(ivtDataParam(dao,ChangeIvtUtil.SUBWAREHOUSING_ADDIVT_QTY));
+            iStIvtStructivtCpService.UpdateIvt(ivtDataParam(dao,ChangeIvtUtil.SUBWAREHOUSING_ADDIVT_QTY,null));
 
             // 3）解锁终点
             unLockNext(dao.getStruct_id(),dao.getStoragevehicle_code());
@@ -738,7 +740,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         this.updateById(mstDao);
     }
 
-    public JSONObject ivtDataParam(StIvtIostorinvdisCp disDao,String type) {
+    public JSONObject ivtDataParam(StIvtIostorinvdisCp disDao,String change_type,String sale_id) {
         JSONObject ivtParam = new JSONObject();
         ivtParam.put("struct_id", disDao.getStruct_id());
         ivtParam.put("material_id", disDao.getMaterial_id());
@@ -746,7 +748,8 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         ivtParam.put("quality_scode", disDao.getQuality_scode());
         ivtParam.put("ivt_level", disDao.getIvt_level());
         ivtParam.put("change_qty", disDao.getReal_qty());
-        ivtParam.put("change_type", type);
+        ivtParam.put("change_type", change_type);
+        ivtParam.put("sale_id", sale_id);
 
         return ivtParam;
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
index a8de0dee..f1caa535 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
@@ -25,6 +25,7 @@ public interface IStIvtStructivtCpService extends IService<StIvtStructivtCp> {
      *     ivt_level：库存等级
      *     change_qty：变动数量
      *     change_type：变动类型
+     *     sale_id: 生产订单标识
      * }
      */
     void UpdateIvt(JSONObject json);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
index 284bfffb..f92b489d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
@@ -101,6 +101,7 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl<StIvtStructivtCpMap
             dao.setIvt_qty(BigDecimal.valueOf(0));
             dao.setWarehousing_qty(json.getBigDecimal("change_qty"));
             dao.setQty_unit_id(materDao.getBase_unit_id());
+            dao.setSale_id(json.getString("sale_id"));
             this.save(dao);
 
         } else {
diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
index 9a8eda45..6ff7af65 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
@@ -186,7 +186,7 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="单据类型" :formatter="bill_typeFormat" />
         <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" min-width="120"/>
-        <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />
+<!--        <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />-->
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column label="总重量" align="center" prop="total_qty">
           <template slot-scope="scope">
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
index 8e8d0a8f..870873d8 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
@@ -1,11 +1,11 @@
-<!--suppress ALL -->
 <template>
   <el-dialog
-    title="出库单编辑"
+    :title="crud.status.title"
     append-to-body
     fullscreen
     :before-close="crud.cancelCU"
     :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    width="1200px"
     @open="open"
     @close="close"
   >
@@ -26,39 +26,39 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
-      <el-form-item label="生产车间" prop="product_code">
-        <label slot="label">生产车间:</label>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
         <el-select
-          v-model="form.product_code"
+          v-model="form.bill_type"
           clearable
-          placeholder="生产车间"
+          size="mini"
+          placeholder="业务类型"
           class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-          @change="storChange"
         >
           <el-option
-            v-for="item in dict.product_area"
+            v-for="item in dict.ST_INV_OUT_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="业务类型" prop="bill_type">
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓库</label>
         <el-select
-          v-model="form.bill_type"
+          v-model="form.stor_id"
           clearable
-          filterable
-          size="mini"
-          placeholder="业务类型"
           class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
         >
           <el-option
-            v-for="item in dict.bill_type"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
           />
         </el-select>
       </el-form-item>
@@ -94,19 +94,15 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
       </el-form-item>
     </el-form>
 
-    <div class="crud-opts2">
-      <span class="role-span">出库明细</span>
-      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
-
+    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
         <el-button
@@ -115,11 +111,11 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
-          @click="queryDtl()"
+          @click="insertEvent()"
         >
-          添加物料
+          添加发货物料
         </el-button>
-        <!--   <el-button
+        <el-button
           slot="left"
           class="filter-item"
           type="primary"
@@ -128,7 +124,7 @@
           @click="insertdtl()"
         >
           新增一行
-        </el-button>-->
+        </el-button>
       </span>
 
     </div>
@@ -140,97 +136,117 @@
       border
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
-        <!-- <template scope="scope">
+        <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
-            <el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
+            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
           </el-input>
           <span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
-        <!--   <template scope="scope">
-          <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
-          <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
-        <template scope="scope">
-          <el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
-          <!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
         </template>
       </el-table-column>
-      <el-table-column prop="qty_unit_name" label="单位" align="center" />
-      <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
-        <template scope="scope">
-          <el-input v-model="scope.row.remark" size="mini" />
-          <span>{{ scope.row.remark }}</span>
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="出库数量">
+        <template slot-scope="scope">
+          <el-input-number
+            v-show="!scope.row.edit"
+            v-model="form.tableData[scope.$index].plan_qty"
+            size="small"
+            :controls="false"
+            controls-position="right"
+            precision="3"
+            :min="0"
+            @change="changeQty"
+          />
+          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
-      </el-table-column>-->
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />
+      <el-table-column show-overflow-tooltip prop="remark" label="明细备注">
+        <template slot-scope="scope">
+          <el-input v-model="form.tableData[scope.$index].remark" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" />
+      <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" />
+
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
-          <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
         </template>
       </el-table-column>
     </el-table>
 
-    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
-    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
+    <MaterDtl
+      :dialog-show.sync="materShow"
+      :is-single="true"
+      :mater-opt-code="materType"
+      @setMaterValue="tableChanged1"
+    />
+
+    <AddDtl
+      :dialog-show.sync="dtlShow"
+      @tableChanged="tableChanged2"
+    />
+
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/storage_manage/product/productOut/AddDtl'
-import MaterDialog from '@/views/wms/pub/MaterDialog'
-import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+import AddDtl from '@/views/wms/storage_manage/product/productOut/AddDtl'
+import crudStorattr, {getStor} from '@/views/wms/storage_manage/basedata/basedata'
 
 const defaultForm = {
   bill_code: '',
-  stor_id: '',
-  stor_code: '',
-  stor_name: '',
+  product_code: '',
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
   bill_type: '',
   remark: '',
+  workshop_id: '',
+  stor_id: '',
   biz_date: new Date(),
-  out_stor_id: '',
   create_mode: '',
   tableData: []
 }
+
 export default {
   name: 'AddDialog',
-  components: { AddDtl, MaterDialog },
+  components: { MaterDtl, AddDtl },
   mixins: [crud(), form(defaultForm)],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
   props: {
     dialogShow: {
       type: Boolean,
       default: false
+    },
+    openParam: {
+      type: Object
     }
   },
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
   data() {
     return {
       dialogVisible: false,
-      dtlShow: false,
-      materType: '',
       materShow: false,
-      flagnow: false,
-      nowrow: {},
-      nowindex: '',
+      dtlShow: false,
+      opendtlParam: null,
+      materType: '03', // 关键成品
       storlist: [],
-      inStorList: [],
-      invtypelist: [],
-      storId: null,
+      billtypelist: [],
       rules: {
-        product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
         ],
         bill_type: [
           { required: true, message: '业务类型不能为空', trigger: 'blur' }
@@ -243,128 +259,126 @@ export default {
   },
   watch: {
     dialogShow: {
-      handler(newValue) {
+      handler(newValue, oldValue) {
         this.dialogVisible = newValue
       }
     }
   },
   methods: {
     open() {
-      crudProductIn.queryStor().then(res => {
-        this.storlist = res
+      crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+        this.storlist = res.content
       })
     },
     close() {
       this.$emit('AddChanged')
     },
-    [CRUD.HOOK.beforeSubmit]() {
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-    },
     [CRUD.HOOK.afterToEdit]() {
-      productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        /*   for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          row.edit = false
-          this.form.tableData.splice(i, 1, row)
-        }*/
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      // 获取入库单明细
+      crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
-          row.edit = true
           this.form.tableData.splice(i, 1, row)
         }
       })
     },
-    invtypeFormat(row, column) {
-      return this.dict.label.bill_type[row.source_bill_type]
-    },
-    storChange(row) {
-      this.storlist.forEach((item) => {
-        if (item.product_code === row) {
-          this.form.product_code = item.product_code
+    [CRUD.HOOK.afterToView]() {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          this.form.tableData.splice(i, 1, row)
         }
       })
     },
-    async queryMater(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
+
+    [CRUD.HOOK.beforeSubmit]() {
+      // 提交前校验
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
       }
-      this.materShow = true
-      this.nowindex = index
-      this.nowrow = row
-    },
-    queryDtl(index, row) {
-      if (this.form.bill_type === '') {
-        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.form.product_code === '') {
-        this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.storId = this.form.product_code
-      this.dtlShow = true
-    },
-    tableChanged5(rows) {
-      rows.forEach((item) => {
-        if (this.form.tableData.length !== 0) {
-          this.flagnow = false
-          for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].material_id === item.material_id && 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) {
-          this.crud.notify('不允许添加相同物料！')
+        const row = this.form.tableData[i]
+        if (!row.plan_qty) {
+          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }
+    },
+    deleteRow(index, rows) {
+      const material_code = rows[index].material_code
+      let len = rows.length
+      while (len--) {
+        const obj = rows[len]
+        if (material_code === obj.material_code) {
+          const index = rows.indexOf(obj)
+          if (index > -1) { // 移除找到的指定元素
+            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
+            rows.splice(index, 1)
+            this.form.detail_count = this.form.tableData.length
+          }
+        }
+      }
+    },
+    tableChanged(rows) {
+      // 对新增的行进行校验不能存在相同物料批次
+      rows.forEach((item) => {
+        let same_mater = true
+        this.form.tableData.forEach((row) => {
+          if (row.material_code === item.material_code) {
+            same_mater = false
+          }
+        })
+        if (same_mater) {
+          item.quality_scode = '01'
+          item.ivt_level = '01'
+          item.is_active = '1'
+          item.plan_qty = '0'
+          item.edit = true
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+          this.form.tableData.splice(-1, 0, item)
+        }
+      })
+      this.form.detail_count = this.form.tableData.length
+    },
+    tableChanged1(row) {
       this.nowrow.material_id = row.material_id
       this.nowrow.material_code = row.material_code
       this.nowrow.material_name = row.material_name
-      this.nowrow.qty_unit_id = row.base_unit_id
+      this.nowrow.plan_qty = '0'
       this.nowrow.qty_unit_name = row.unit_name
-      this.nowrow.plan_qty = '1'
-      this.nowrow.edit = false
-      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+      this.nowrow.qty_unit_id = row.base_unit_id
+
     },
-    async insertdtl() {
+    tableChanged2(row) {
+
+    },
+    insertEvent(row) {
+      this.dtlShow = true
+    },
+    queryMater(index, row) {
+      this.nowindex = index
+      this.nowrow = row
+      this.materShow = true
+    },
+    insertdtl() {
       if (this.form.bill_type === '') {
         this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
+      this.form.tableData.push({ edit: false, plan_qty: '0' })
       this.form.detail_count = this.form.tableData.length
     },
-    deleteRow(index, rows) {
-      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-      rows.splice(index, 1)
+    changeQty() {
+      this.form.total_qty = 0
+      this.form.tableData.forEach((item) => {
+        this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+      })
     }
   }
 }
@@ -372,16 +386,13 @@ export default {
 
 <style>
 .crud-opts2 {
-  padding: 0 0;
+  padding: 4px 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>
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
index 38388e8d..a42f5ed8 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -24,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"
@@ -93,17 +92,6 @@
         >
           手工分配
         </el-button>-->
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="warning"
-          :loading="loadingSetAllPoint"
-          icon="el-icon-check"
-          size="mini"
-          @click="allSetPointAllDtl"
-        >
-          一键设置
-        </el-button>
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -127,6 +115,9 @@
         <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 show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
       </el-table>
     </el-card>
     <div class="crud-opts2">
@@ -151,7 +142,7 @@
               disabled
             />
           </el-form-item>
-          <!--   <el-form-item label="出库点" prop="point_code">
+           <el-form-item label="出库点" prop="point_code">
             <el-select
               v-model="form2.point_code"
               clearable
@@ -166,24 +157,12 @@
                 :value="item.point_code"
               />
             </el-select>
-          </el-form-item>-->
+          </el-form-item>
         </el-form>
       </div>
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
-        <!--      <el-button
-          slot="left"
-          class="filter-item"
-          :loading="loadingSetPoint"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="button4"
-          @click="oneSetPoint2"
-        >
-          设置站点
-        </el-button>-->
         <el-button
           slot="left"
           class="filter-item"
@@ -211,7 +190,7 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDisCurrentChange"
       >
-        <el-table-column prop="bill_status" label="状态" align="center" width="110px">
+       <!-- <el-table-column prop="bill_status" label="状态" align="center" width="110px">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.work_status"
@@ -226,7 +205,7 @@
               />
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称" width="250px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="material_spec" label="物料规格" width="150px" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
@@ -246,8 +225,8 @@
 import CRUD, { crud } from '@crud/crud'
 import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 import StructIvt from '@/views/wms/storage_manage/product/productOut/StructIvt'
-import crudRegion from '@/views/wms/scheduler_manage/region/region'
 import crudPoint from '@/views/wms/scheduler_manage/point/point'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
 
 export default {
   name: 'DivDialog',
@@ -328,13 +307,12 @@ export default {
   },
   methods: {
     open() {
-      crudRegion.getRegionSelect({ 'stor_id': this.storId }).then(res => {
+      crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
-
-      const area_type = 'A1_CK01'
+      const area_type = 'A1_RK01'
       crudPoint.getPoint({ 'area_type': area_type }).then(res => {
-        this.pointList = res
+        this.pointlist = res
       })
     },
     close() {
@@ -356,26 +334,6 @@ export default {
         }
       }
     },
-    openPoint() {
-      if (this.mstrow.bill_type === '010101') {
-        this.areatype = "'31'"
-      } else if (this.mstrow.bill_type === '010201' || this.mstrow.bill_type === '010202' || this.mstrow.bill_type === '010401') {
-        this.areatype = "'21'"
-      } else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501') {
-        this.areatype = "'22','23','24'"
-      } else if (this.mstrow.bill_type === '010502') {
-        this.areatype = "'21','22','23','24'"
-      } else if (this.mstrow.bill_type === '010801') {
-        this.areatype = "'22','23','24','31','35'"
-      } else if (this.mstrow.bill_type === '010601') {
-        this.areatype = ''
-      }
-      this.pointshow = true
-      this.$refs.child.getMsg(this.areatype)
-    },
-    PointChanged(row) {
-      this.form2.point_code = row.point_code
-    },
     openStructIvt() {
       this.currentRow.remark = ''
       this.currentRow.stor_id = this.storId
@@ -399,13 +357,6 @@ export default {
         this.mstrow.sect_id = val[1]
       }
     },
-    tabledisabled(row) {
-      if ((row.work_status === '00' || row.work_status === '01') && row.is_issued === '0') {
-        return false
-      } else {
-        return true
-      }
-    },
     deleteRow(row) {
       productOut.oneCancel(row).then(res => {
         this.queryTableDtl()
@@ -492,42 +443,6 @@ export default {
         })
       }
     },
-    allSetPoint() {
-    /*  if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }*/
-      if (this.currentRow === '') {
-        this.crud.notify('请选择明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.loadingSetAllPoint = true
-      this.currentRow.point_code = this.form2.point_code
-      productOut.allSetPoint(this.currentRow).then(res => {
-        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
-        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        this.loadingSetAllPoint = false
-      }).catch(() => {
-        this.loadingSetAllPoint = false
-      })
-    },
-    allSetPointAllDtl() {
-    /*  if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }*/
-      this.loadingSetAllPoint = true
-      const data = {
-        'point_code': this.form2.point_code,
-        'iostorinv_id': this.mstrow.iostorinv_id
-      }
-      productOut.allSetPoint(data).then(res => {
-        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        this.loadingSetAllPoint = false
-      }).catch(() => {
-        this.loadingSetAllPoint = false
-      })
-    },
     queryTableDtl() {
       productOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
         this.tableDtl = res
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
index 946ed89e..aff4da86 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <div class="app-container">
     <!--工具栏-->
@@ -128,6 +127,32 @@
         @select="handleSelectionChange"
         @select-all="onSelectAll"
       >
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="单据类型" :formatter="bill_typeFormat" />
+        <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" min-width="120"/>
+        <!--        <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />-->
+        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
+        <el-table-column label="总重量" align="center" prop="total_qty">
+          <template slot-scope="scope">
+            {{ fun(scope.row.total_qty) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="明细数" align="center" prop="detail_count" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建人" align="center" prop="create_name" />
+        <el-table-column label="创建时间" align="center" prop="create_time" width="150" />
+        <el-table-column label="修改人" align="center" prop="update_name" />
+        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
+        <el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
+        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
+        <el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
+        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -138,27 +163,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column show-overflow-tooltip prop="bill_code" width="130" 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 show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
-        <el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
-        <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
-        <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
-        <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
-        <el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
-        <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
-        <el-table-column show-overflow-tooltip label="制单人" align="center" prop="create_name" />
-        <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="create_time" width="140" />
-        <el-table-column show-overflow-tooltip label="修改人" align="center" prop="create_name" />
-        <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
-        <el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_name" />
-        <el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
-        <el-table-column show-overflow-tooltip label="确认人" align="center" prop="confirm_name" />
-        <el-table-column show-overflow-tooltip label="确认时间" align="center" prop="confirm_time" width="140" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -179,7 +183,7 @@ import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/storage_manage/product/productOut/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/product/productOut/DivDialog'
 import ViewDialog from '@//views/wms/storage_manage/product/productOut/ViewDialog'
-import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
+import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
 
 export default {
   name: 'ProductOut',
@@ -230,11 +234,14 @@ export default {
     }
   },
   created() {
-    crudProductIn.queryStor().then(res => {
-      this.storlist = res
+    crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+      this.storlist = res.content
     })
   },
   methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
     canUd(row) {
       return row.bill_status !== '10'
     },
@@ -293,9 +300,9 @@ export default {
       return row.bill_status !== '99'
     },
     divOpen() {
-      productOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+      productOut.getIosInvDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         this.openParam = res
-        this.storId = this.currentRow.product_code
+        this.storId = this.currentRow.stor_id
         this.divShow = true
         this.mstrow = this.currentRow
       })
diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
index 8d4c1e1c..5ea08a5a 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
+++ b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
@@ -10,219 +10,26 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/productOut/',
-    method: 'delete',
+    url: 'api/productOut/delete',
+    method: 'post',
     data: ids
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/productOut',
-    method: 'put',
+    url: 'api/productOut/update',
+    method: 'post',
     data
   })
 }
 
-export function getOutBillDtl(data) {
+export function getIosInvDtl(data) {
   return request({
-    url: '/api/productOut/getOutBillDtl',
+    url: 'api/productOut/getIosInvDtl',
     method: 'post',
     data
   })
 }
-export function getOutBillDis(data) {
-  return request({
-    url: '/api/productOut/getOutBillDis',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillDisDtl(params) {
-  return request({
-    url: '/api/productOut/getOutBillDisDtl',
-    method: 'get',
-    params
-  })
-}
-export function getOutBillTask(params) {
-  return request({
-    url: '/api/productOut/getOutBillTask',
-    method: 'get',
-    params
-  })
-}
-export function getInvTypes() {
-  return request({
-    url: '/api/productOut/getInvTypes',
-    method: 'get'
-  })
-}
-export function insertDtl(data) {
-  return request({
-    url: '/api/productOut/insertDtl',
-    method: 'post',
-    data
-  })
-}
-export function allDiv(data) {
-  return request({
-    url: '/api/productOut/allDiv',
-    method: 'post',
-    data
-  })
-}
-export function allDivOne(data) {
-  return request({
-    url: '/api/productOut/allDivOne',
-    method: 'post',
-    data
-  })
-}
-export function allCancel(data) {
-  return request({
-    url: '/api/productOut/allCancel',
-    method: 'post',
-    data
-  })
-}
-export function oneCancel(data) {
-  return request({
-    url: '/api/productOut/oneCancel',
-    method: 'post',
-    data
-  })
-}
-export function setPoint(data) {
-  return request({
-    url: '/api/productOut/setPoint',
-    method: 'post',
-    data
-  })
-}
-export function oneSetPoint(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint',
-    method: 'post',
-    data
-  })
-}
-export function getStructIvt(params) {
-  return request({
-    url: '/api/productOut/getStructIvt',
-    method: 'get',
-    params
-  })
-}
-export function manualDiv(data) {
-  return request({
-    url: '/api/productOut/manualDiv',
-    method: 'post',
-    data
-  })
-}
-export function confirm(data) {
-  return request({
-    url: '/api/productOut/confirm',
-    method: 'post',
-    data
-  })
-}
-export function issueTask(data) {
-  return request({
-    url: '/api/productOut/issueTask',
-    method: 'post',
-    data
-  })
-}
-export function finishTask(data) {
-  return request({
-    url: '/api/productOut/finishTask',
-    method: 'post',
-    data
-  })
-}
-export function cancleTaskfinish(data) {
-  return request({
-    url: '/api/productOut/cancleTaskfinish',
-    method: 'post',
-    data
-  })
-}
-export function paramByCodeType(data) {
-  return request({
-    url: '/api/productOut/paramByCodeType',
-    method: 'post',
-    data
-  })
-}
-export function schAreaType(data) {
-  return request({
-    url: '/api/productOut/schAreaType',
-    method: 'post',
-    data
-  })
-}
-export function backConfirm(data) {
-  return request({
-    url: '/api/productOut/backConfirm',
-    method: 'post',
-    data
-  })
-}
-export function getType() {
-  return request({
-    url: '/api/productOut/getType',
-    method: 'get'
-  })
-}
-export function moneySubmit(data) {
-  return request({
-    url: '/api/productOut/moneySubmit',
-    method: 'post',
-    data
-  })
-}
-export function getDisNum(data) {
-  return request({
-    url: '/api/productOut/getDisNum',
-    method: 'post',
-    data
-  })
-}
-export function queryBox(data) {
-  return request({
-    url: '/api/productOut/queryBox',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillTask2(data) {
-  return request({
-    url: '/api/productOut/getOutBillTask2',
-    method: 'post',
-    data
-  })
-}
-export function cancelTask(data) {
-  return request({
-    url: '/api/productOut/cancelTask',
-    method: 'post',
-    data
-  })
-}
-export function allSetPoint(data) {
-  return request({
-    url: '/api/productOut/allSetPoint',
-    method: 'post',
-    data
-  })
-}
-export function oneSetPoint2(data) {
-  return request({
-    url: '/api/productOut/oneSetPoint2',
-    method: 'post',
-    data
-  })
-}
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
+
+export default { add, edit, del, getIosInvDtl }
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
deleted file mode 100644
index bb5a315d..00000000
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
+++ /dev/null
@@ -1,410 +0,0 @@
-<template>
-  <el-dialog
-    :title="crud.status.title"
-    append-to-body
-    fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
-    width="1200px"
-    @open="open"
-    @close="close"
-  >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
-      <el-form-item label="单据号" prop="bill_code">
-        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
-        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="仓库" prop="product_code">
-        <label slot="label">所属仓库2:</label>
-        <el-select
-          v-model="form.stor_id"
-          clearable
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-        >
-          <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="入库点" prop="point_code">
-        <label slot="label">入库点:</label>
-        <el-select
-          v-model="form.point_code"
-          clearable
-          class="filter-item"
-          style="width: 210px"
-          :disabled="crud.status.view > 0"
-        >
-          <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="业务类型" prop="bill_type">
-        <el-select
-          v-model="form.bill_type"
-          clearable
-          placeholder="业务类型"
-          style="width: 210px"
-          class="filter-item"
-          :disabled="crud.status.view > 0"
-        >
-          <el-option
-            v-for="item in dict.bill_type"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="单据状态" prop="bill_status">
-        <el-select
-          v-model="form.bill_status"
-          clearable
-          style="width: 210px"
-          placeholder="单据状态"
-          class="filter-item"
-          disabled
-        >
-          <el-option
-            v-for="item in dict.IO_BILL_STATUS"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="明细数" prop="detail_count">
-        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
-        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="总重量" prop="total_qty">
-        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
-        <el-input-number
-          v-model="form.total_qty"
-          :controls="false"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="业务日期" prop="biz_date">
-        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-      </el-form-item>
-    </el-form>
-
-    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-    <div v-show="crud.status.add === 1" class="crud-opts2" style="margin-bottom: 5px;">
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="insertEvent()"
-        >
-          添加物料
-        </el-button>
-      </span>
-
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="form.tableData"
-      style="width: 100%;"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column type="index" label="序号" width="55" align="center" />
-
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
-      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
-      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
-      <el-table-column show-overflow-tooltip prop="base_bill_code" label="订单号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].base_bill_code"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="form.tableData[scope.$index].plan_qty"
-            size="small"
-            :controls="false"
-            controls-position="right"
-            precision="3"
-            :min="0"
-            @change="changeQty"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="unit_weight" label="单重">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="form.tableData[scope.$index].unit_weight"
-            size="small"
-            :controls="false"
-            controls-position="right"
-            precision="3"
-            :min="0"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].storagevehicle_code"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
-        <template scope="scope">
-          <el-button
-            type="danger"
-            class="filter-item"
-            size="mini"
-            icon="el-icon-delete"
-            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <MaterDtl
-      :dialog-show.sync="materShow"
-      :is-single="false"
-      :mater-opt-code="materType"
-      @setMaterValue="tableChanged"
-    />
-
-  </el-dialog>
-</template>
-
-<script>
-import CRUD, { crud, form } from '@crud/crud'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
-
-const defaultForm = {
-  bill_code: '',
-  product_code: 'A1',
-  bill_status: '1',
-  total_qty: '0',
-  detail_count: '0',
-  bill_type: '',
-  remark: '',
-  biz_date: new Date(),
-  create_mode: '',
-  tableData: []
-}
-
-export default {
-  name: 'AddDialog',
-  components: { MaterDtl },
-  mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
-  cruds() {
-    return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductIn }})
-  },
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    openParam: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      materShow: false,
-      dtlShow: false,
-      opendtlParam: null,
-      materType: '03', // 关键成品
-      storlist: [],
-      billtypelist: [],
-      rules: {
-        product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
-        ],
-        bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-      crudsemiproductIn.queryStor().then(res => {
-        this.storlist = res.content
-      })
-    },
-    close() {
-      this.$emit('AddChanged')
-    },
-    [CRUD.HOOK.afterToEdit]() {
-      // 获取入库单明细
-      crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
-        this.form.tableData = res.content
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-
-    [CRUD.HOOK.beforeSubmit]() {
-      // 提交前校验
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-
-      for (let i = 0; i < this.form.tableData.length; i++) {
-        const row = this.form.tableData[i]
-        if (!row.base_bill_code) {
-          this.crud.notify('订单号', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.plan_qty) {
-          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!this.form.stor_id) {
-          this.crud.notify('所属仓库不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!this.form.point_code) {
-          this.crud.notify('入库点不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.storagevehicle_code) {
-          this.crud.notify('载具不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.unit_weight) {
-          this.crud.notify('单重不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-      }
-    },
-    deleteRow(index, rows) {
-      const material_code = rows[index].material_code
-      let len = rows.length
-      while (len--) {
-        const obj = rows[len]
-        if (material_code === obj.material_code) {
-          const index = rows.indexOf(obj)
-          if (index > -1) { // 移除找到的指定元素
-            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
-            rows.splice(index, 1)
-            this.form.detail_count = this.form.tableData.length
-          }
-        }
-      }
-    },
-    tableChanged(rows) {
-      // 对新增的行进行校验不能存在相同物料批次
-      rows.forEach((item) => {
-        let same_mater = true
-        this.form.tableData.forEach((row) => {
-          if (row.material_code === item.material_code) {
-            same_mater = false
-          }
-        })
-        if (same_mater) {
-          item.quality_scode = '01'
-          item.ivt_level = '01'
-          item.is_active = '1'
-          item.plan_qty = '1'
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-          this.form.tableData.splice(-1, 0, item)
-        }
-      })
-      this.form.detail_count = this.form.tableData.length
-    },
-    insertEvent(row) {
-      this.materShow = true
-    },
-    changeQty() {
-      this.form.total_qty = 0
-      this.form.tableData.forEach((item) => {
-        this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
-      })
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-</style>
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
index 5a265278..2575add0 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
@@ -9,8 +9,11 @@ import org.nl.acs.acsEnum.WorkerOrderEnum;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo;
+import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.ext.wms.service.AcsToWmsService;
+import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.history.service.DeviceErrorLogService;
 import org.nl.acs.history.service.dto.DeviceErrorLogDto;
@@ -19,8 +22,10 @@ import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
 import org.nl.acs.order.service.dto.EalingOrderDto;
 import org.nl.acs.order.service.dto.ProduceshiftorderDto;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -37,9 +42,15 @@ import java.util.Map;
 public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
 
+    @Autowired
+    AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
+    @Autowired
     DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
     @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+    @Autowired
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
 
     int heartbeat = 0;
@@ -47,12 +58,16 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
     int error = 0;
     int task = 0;
     int move = 0;
+    int order = 0;
+    int finish = 0;
     String barcode,last_barcode;
 
     int last_heartbeat = 0;
     int last_mode = 0;
     int last_error = 0;
     int last_task = 0;
+    int last_finish = 0;
+    int last_order = 0;
 
 
     Boolean isonline = true;
@@ -77,7 +92,8 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
             device_code = this.getDeviceCode();
             mode = this.itemProtocol.getMode();
             error = this.itemProtocol.getError();
-
+            order = this.itemProtocol.getOrder();
+            finish = this.itemProtocol.getOrder_finish();
             if (mode != last_mode) {
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
             }
@@ -92,7 +108,33 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
                 }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
             }
+            if (finish != last_finish) {
+                if (mode == 2 && finish == 1) {
+                    MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
+                }
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号finish：" + last_finish + "->" + finish);
+            }
 
+            // 修改工单状态为生产中
+            if (mode == 2 && order > 0) {
+                ProduceshiftorderDto pdto = produceshiftorderService.findByCodeFromCache(String.valueOf(order));
+                if (pdto != null) {
+                    if (pdto.getOrder_status().equals(WorkerOrderEnum.READY.getCode())) {
+                        pdto.setOrder_status(WorkerOrderEnum.PRODUCTING.getCode());
+                        produceshiftorderService.update(pdto);
+                    }
+                }
+            }
+
+            //修改工单状态为自动完成
+            if (mode == 2 && finish != last_finish && finish == 1 && order > 0) {
+                ProduceshiftorderDto pdto = produceshiftorderService.findByCodeFromCache(String.valueOf(order));
+                if (pdto != null) {
+                    if (pdto.getOrder_status().equals(WorkerOrderEnum.PRODUCTING.getCode())) {
+                        produceshiftorderService.finished(pdto);
+                    }
+                }
+            }
 
         } catch (Exception var17) {
             var17.printStackTrace();
@@ -117,6 +159,9 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
         last_mode = mode;
         last_error = error;
         last_task = task;
+        last_finish = finish;
+        last_order = order;
+
     }
 
 
@@ -141,24 +186,30 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
 
     @Override
     public void issuedOrderInfo(ProduceshiftorderDto dto) {
-        EalingOrderDto ealingOrderDto = dto.getEalingOrderDto();
-        if (ealingOrderDto != null) {
-            String is_foreward = ealingOrderDto.getIs_foreward();
+        if (dto != null) {
             Map<String, Object> map = new HashMap<>();
-            map.put("to_qty", dto.getQty());
+            map.put("to_clear", "1");
+            map.put("to_order_qty", String.valueOf(dto.getQty()));
             map.put("to_order", dto.getOrder_code());
-            map.put("item_to_bz_qty", dto.getPackage_qty());
-            map.put("item_to_box_qty", dto.getBox_num());
+            map.put("to_bz_qty", dto.getPackage_qty());
+            map.put("to_box_qty", dto.getBox_num());
             map.put("to_one_box_qty", dto.getOne_box_package_qty());
             map.put("to_one_bag_qty", dto.getOne_package_qty());
-            map.put("to_one_box_qty", dto.getOne_box_package_qty());
             this.writing(map);
         }
     }
 
     @Override
     public void issuedOrderFinish(String autoFinish) {
-
+        Map<String, Object> map = new HashMap<>();
+        if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) {
+            map.put("to_finished", "1");
+        } else {
+            map.put("to_confirm_finished", "1");
+        }
+        //map.put("to_order", "0");
+        //map.put("to_clear", "1");
+        this.writing(map);
     }
 
     @Override
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
index f0e9d9b2..9562df72 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/ItemProtocol.java
@@ -26,6 +26,7 @@ public class ItemProtocol {
     public static String item_kz_qty = "kz_qty";
     public static String item_ds_qty = "ds_qty";
     public static String item_bz_qty = "bz_qty";
+    public static String item_bz_box_qty = "bz_box_qty";
     public static String item_order_finish = "order_finish";
     public static String item_order_compulsion_finish = "order_compulsion_finish";
     public static String item_order = "order";
@@ -91,6 +92,10 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_bz_qty);
     }
 
+    public int getBz_box_qty() {
+        return this.getOpcIntegerValue(item_bz_box_qty);
+    }
+
     public int getError() {
         return this.getOpcIntegerValue(item_error);
     }
@@ -111,6 +116,10 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_order);
     }
 
+    public int getOrder_finish() {
+        return this.getOpcIntegerValue(item_order_finish);
+    }
+
 
     //是否有货
     public int hasGoods(int move) {
@@ -157,12 +166,13 @@ public class ItemProtocol {
         list.add(new ItemDto(item_kz_error, "刻字机报警信号", "DB600.W18"));
         list.add(new ItemDto(item_ds_error, "点数机报警信号", "DB600.W20"));
         list.add(new ItemDto(item_bz_error, "包装机报警信号", "DB600.W22"));
-        list.add(new ItemDto(item_kz_qty, "刻字数量", "DB600.W24"));
-        list.add(new ItemDto(item_ds_qty, "点数数量", "DB600.W26"));
-        list.add(new ItemDto(item_bz_qty, "包装数量", "DB600.W28"));
-        list.add(new ItemDto(item_order_finish, "工单完成", "DB600.W30"));
-        list.add(new ItemDto(item_order_compulsion_finish, "工单强制完成", "DB600.W32"));
-        list.add(new ItemDto(item_order, "工单号", "DB600.D34"));
+        list.add(new ItemDto(item_kz_qty, "刻字数量", "DB600.D24"));
+        list.add(new ItemDto(item_ds_qty, "点数数量", "DB600.D28"));
+        list.add(new ItemDto(item_bz_qty, "包装数量", "DB600.W32"));
+        list.add(new ItemDto(item_bz_box_qty, "包装箱数量", "DB600.W34"));
+        list.add(new ItemDto(item_order_finish, "工单完成", "DB600.W36"));
+        list.add(new ItemDto(item_order_compulsion_finish, "工单强制完成", "DB600.W38"));
+        list.add(new ItemDto(item_order, "工单号", "DB600.D40"));
         return list;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
index 4b4ccaa7..64bb9c9c 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
@@ -1,10 +1,13 @@
 package org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_package_ssx;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.AcsConfig;
 import org.nl.acs.acsEnum.WorkerOrderEnum;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
@@ -24,6 +27,7 @@ import org.nl.acs.order.service.dto.ProduceshiftorderDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +49,7 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
 
     int heartbeat = 0;
     int mode = 0;
+    int action = 0;
     int error = 0;
     int task = 0;
     int move = 0;
@@ -61,8 +66,8 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
     Boolean isonline = true;
     String message = null;
     Boolean iserror = false;
-
-    private int instruction_require_time_out;
+    private Date instruction_require_time = new Date();
+    private int instruction_require_time_out = 3000;
     boolean requireSucess = false;
 
     private int instruction_finished_time_out;
@@ -80,6 +85,7 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
             device_code = this.getDeviceCode();
             mode = this.itemProtocol.getMode();
             move = this.itemProtocol.getMove();
+            action = this.itemProtocol.getAction();
             error = this.itemProtocol.getError();
             task = this.itemProtocol.getTask();
             barcode = this.itemProtocol.getBarcode();
@@ -88,11 +94,12 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
             }
             if (move != last_move){
-                if(to_command != 0){
+                message = null;
+                requireSucess =false;
+                if(to_command != 0 &&  "true".equals(this.device.getExtraValue().get("open_scanner"))){
                     this.writing("to_command", "0");
                     this.writing("to_target", "0");
                 }
-                requireSucess =false;
             }
             if (error != last_error) {
                 if (error != 0) {
@@ -113,53 +120,16 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
         }
 
-        if (!this.itemProtocol.getIsonline()) {
-            //this.setIsonline(false);
-            //this.setIserror(true);
-            message = "信号量同步异常";
-            //未联机
-        } else if (mode == 0) {
+        if (mode == 0) {
             message = "未联机";
         } else {
-            message = "";
             Instruction instruction = null;
             List toInstructions;
 
-            if(move == 1 && error == 0 && barcode.length() > 0 && requireSucess == false ){
-                //2305281100001
-               if(barcode.trim().length() == 16){
-                   if(isNumeric(barcode.trim())){
-                       /**
-                        * 工单为前9位
-                        * 第10位是否翻转
-                        * 第11位为前往巷道
-                        * 后5位为流水号
-                        */
-                       String order = barcode.trim().substring(0,9);
-                       int isFlip = Integer.parseInt(barcode.trim().substring(9,10));
-                       int target = Integer.parseInt(barcode.trim().substring(10,11));
-                       if(isFlip>0 && target>0){
-                           this.writing("to_is_flip",String.valueOf(isFlip));
-                           this.writing("to_target", String.valueOf(target));
-                           this.writing("to_command","1");
-                           requireSucess = true;
-                       } else {
-                           message = "条码:"+ barcode + ",是否翻转:"+isFlip + "目标巷道:"+target;
-                       }
-
-
-                   } else {
-                       message = "条码不为数字，无法解析";
-                   }
-               } else {
-                   message = "条码长度不等于16，无法下发目标位置";
-               }
+            if(action == 1 && move > 0 && error == 0 && barcode.length() > 0 && "true".equals(this.device.getExtraValue().get("open_scanner"))){
+                applyTarget(barcode.trim());
             }
 
-
-
-
-
         }
         last_mode = mode;
         last_move = move;
@@ -169,6 +139,43 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
     }
 
 
+    public synchronized void applyTarget(String barcode) {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return;
+        } else {
+            //2305281100001
+            if (barcode.trim().length() == 16) {
+                if (isNumeric(barcode.trim())) {
+                    /**
+                     * 工单为前9位
+                     * 第10位是否翻转
+                     * 第11位为前往巷道
+                     * 后5位为流水号
+                     */
+                    String order = barcode.trim().substring(0, 9);
+                    int isFlip = Integer.parseInt(barcode.trim().substring(9, 10));
+                    int target = Integer.parseInt(barcode.trim().substring(10, 11));
+                    if (target > 0) {
+                        this.writing("to_is_flip", String.valueOf(isFlip));
+                        this.writing("to_target", String.valueOf(target));
+                        this.writing("to_command", "1");
+                        requireSucess = true;
+                    } else {
+                        message = "条码:" + barcode + ",是否翻转:" + isFlip + "目标巷道:" + target;
+                    }
+
+
+                } else {
+                    message = "条码不为数字，无法解析";
+                }
+            } else {
+                message = "条码长度不等于16，无法下发目标位置";
+            }
+        }
+    }
+
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
@@ -178,23 +185,23 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
         String move = "";
         if (this.getMode() == 0) {
             mode = "未联机";
+            jo.put("isOnline", false);
         } else if (this.getMode() == 1) {
             mode = "单机";
+            jo.put("isOnline", false);
         } else if (this.getMode() == 2) {
             mode = "联机";
+            jo.put("isOnline", true);
         } else if (this.getMode() == 3) {
             mode = "运行中";
+            jo.put("isOnline", true);
         }
         if (this.getMove() == 0) {
             move = "无货";
             jo.put("hasGoods", false);
-        } else if (this.getMove() == 1) {
+        } else if (this.getMove() > 0) {
             move = "有货";
             jo.put("hasGoods", true);
-        } else if (this.getMove() == 2) {
-            move = "有托盘有货";
-            jo.put("move", move);
-            jo.put("hasGoods", true);
         }
         jo.put("move", move);
         jo.put("mode", mode);
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
index 7d5a0ea4..4f708bb2 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
@@ -1,5 +1,7 @@
 package org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_palletizing_station;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -22,6 +24,8 @@ import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.order.service.ProduceshiftorderService;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +60,8 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
     ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
     @Autowired
     DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
-
+    @Autowired
+    LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
     Boolean isonline = true;
     int hasGoods = 0;
     String message = null;
@@ -72,7 +77,8 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
     private int instruction_require_time_out = 3000;
     //请求成功标记
     Boolean requireSucess = false;
-
+    JSONArray barcodeArr = new JSONArray();
+    JSONArray last_barcodeArr = new JSONArray();
     String device_code;
 
     //心跳
@@ -112,25 +118,17 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
             error = this.itemProtocol.getError();
             boxtype = this.itemProtocol.getBoxtype();
             if (mode != last_mode) {
-                logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
+
             }
-            if (move != last_move) {
-                logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
+
+            if(!ObjectUtil.equal(barcodeArr,last_barcodeArr)){
+                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"码垛工位当前最新条码:"+barcodeArr.toString()));
             }
-            if (number != last_number) {
-                logServer.deviceItemValue(this.device_code, "number", String.valueOf(number));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号number：" + last_number + "->" + number);
-            }
-            if (error != last_error) {
-                logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
-            }
-            if (boxtype != last_boxtype) {
-                logServer.deviceItemValue(this.device_code, "boxtype", String.valueOf(boxtype));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号boxtype：" + last_boxtype + "->" + boxtype);
+
+            if(number != last_number && number ==0 ){
+                barcodeArr.clear();
             }
+
         } catch (Exception var17) {
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
             return;
@@ -157,6 +155,9 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
             this.setIserror(false);
 
         }
+        last_mode = mode;
+        last_number = number;
+        last_barcodeArr = barcodeArr;
     }
 
     protected void executing(Instruction instruction) {
@@ -180,6 +181,7 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
         Map<String, Object> itemMap = new HashMap<String, Object>();
         itemMap.put(to_param, Integer.parseInt(value));
         ReadUtil.write(itemMap, server);
+        server.dispose();
     }
 
 
@@ -192,12 +194,16 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
         String move = "";
         if (this.getMode() == 0) {
             mode = "未联机";
+            jo.put("isOnline", false);
         } else if (this.getMode() == 1) {
             mode = "单机";
+            jo.put("isOnline", false);
         } else if (this.getMode() == 2) {
             mode = "联机";
+            jo.put("isOnline", true);
         } else if (this.getMode() == 3) {
             mode = "运行中";
+            jo.put("isOnline", true);
         }
         if (this.getMove() == 0) {
             move = "无货";
@@ -209,11 +215,16 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
             move = "有托盘有货";
             jo.put("hasGoods", true);
         }
+        jo.put("move", move);
+        jo.put("mode", mode);
+        jo.put("number", this.itemProtocol.getNumber());
+        jo.put("boxType", this.itemProtocol.getBoxtype());
         jo.put("isOnline", this.getIsonline());
         jo.put("isError", this.getIserror());
         jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("message", message);
+        jo.put("barcodeArr",barcodeArr);
         return jo;
     }
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
index 8cdd07cb..42727180 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
@@ -1,6 +1,7 @@
 package org.nl.acs.device_driver.basedriver.hailiang_old.hailiang_old_stacking_manipulator;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -99,8 +100,6 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
     Boolean singlePlacementRequireSuccess = false;
     //请求码垛完成标志
     Boolean stackingRequireSuccess = false;
-
-    JSONArray barcodeArr = new JSONArray();
     //当前设备状态    01代表 关机, 02代表 开机, 03代表 生产中, 04代表 待机, 05代表 异常
     int status_type = 0;
     //上次设备状态
@@ -162,25 +161,24 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
                 logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
-            if (getStation != last_getStation) {
-                logServer.deviceItemValue(this.device_code, "getStation", String.valueOf(getStation));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号getStation：" + last_getStation + "->" + getStation);
-            }
-            if (putStation != last_putStation) {
-                logServer.deviceItemValue(this.device_code, "putStation", String.valueOf(putStation));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号putStation：" + last_putStation + "->" + putStation);
-            }
-            if (encoder_qty != last_encoder_qty) {
-                logServer.deviceItemValue(this.device_code, "encoder_qty", String.valueOf(encoder_qty));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号encoder_qty：" + last_encoder_qty + "->" + encoder_qty);
-            }
-            if (boxtype != last_boxtype) {
-                logServer.deviceItemValue(this.device_code, "boxtype", String.valueOf(boxtype));
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号boxtype：" + last_boxtype + "->" + boxtype);
-            }
+//            if (getStation != last_getStation) {
+//                logServer.deviceItemValue(this.device_code, "getStation", String.valueOf(getStation));
+//                logServer.deviceExecuteLog(this.device_code, "", "", "信号getStation：" + last_getStation + "->" + getStation);
+//            }
+//            if (putStation != last_putStation) {
+//                logServer.deviceItemValue(this.device_code, "putStation", String.valueOf(putStation));
+//                logServer.deviceExecuteLog(this.device_code, "", "", "信号putStation：" + last_putStation + "->" + putStation);
+//            }
+//            if (encoder_qty != last_encoder_qty) {
+//                logServer.deviceItemValue(this.device_code, "encoder_qty", String.valueOf(encoder_qty));
+//                logServer.deviceExecuteLog(this.device_code, "", "", "信号encoder_qty：" + last_encoder_qty + "->" + encoder_qty);
+//            }
+//            if (boxtype != last_boxtype) {
+//                logServer.deviceItemValue(this.device_code, "boxtype", String.valueOf(boxtype));
+//                logServer.deviceExecuteLog(this.device_code, "", "", "信号boxtype：" + last_boxtype + "->" + boxtype);
+//            }
         } catch (Exception var17) {
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
-            return;
         }
         if (!this.itemProtocol.getIsonline()) {
             this.setIsonline(false);
@@ -274,7 +272,7 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
                 }
                 String order = barcode.trim().substring(0,9);
                 ProduceshiftorderDto dto =produceshiftorderService.findByCodeFromCache(order);
-                if(Objects.isNull(dto)){
+                if(ObjectUtil.isEmpty(dto)){
                     message = "获取托盘信息,工单号:" + order + "未找到对应工单";
                     return false;
                 }
@@ -302,7 +300,10 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
                         HailiangOldPalletizingStationDriver hailiangOldPalletizingStationDriver;
                         if(device.getDeviceDriver() instanceof HailiangOldPalletizingStationDriver){
                             hailiangOldPalletizingStationDriver = (HailiangOldPalletizingStationDriver) device.getDeviceDriver();
-                            if(hailiangOldPalletizingStationDriver.getNumber() == 0 ){
+                            if(hailiangOldPalletizingStationDriver.getNumber() == 0 &&
+                                    hailiangOldPalletizingStationDriver.getMode() == 2 &&
+                                    hailiangOldPalletizingStationDriver.getMove()==1 &&
+                                    hailiangOldPalletizingStationDriver.getBoxtype() ==0) {
                                 targetStation = putDeviceCodeList.get(i);
                                 lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"单次码垛完成，取货位:"+getDeviceCode+",条码:"+barcode +",未找到相同箱型放货位,分配空放货位:"+ putDeviceCodeList.get(i)));
                                 putIndex = i;
@@ -362,19 +363,29 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
 
             //暂时不反馈MES
             Device getDevice = deviceAppservice.findDeviceByCode(getDeviceCode);
+            Device putDevice = deviceAppservice.findDeviceByCode(putDeviceCode);
             HailiangLetteringPackageSsxDeviceDriver hailiangLetteringPackageSsxDeviceDriver;
+            HailiangOldPalletizingStationDriver hailiangOldPalletizingStationDriver;
+            String barcode = null;
             if(getDevice.getDeviceDriver() instanceof HailiangLetteringPackageSsxDeviceDriver ){
                 hailiangLetteringPackageSsxDeviceDriver = (HailiangLetteringPackageSsxDeviceDriver) getDevice.getDeviceDriver();
-                String barcode = hailiangLetteringPackageSsxDeviceDriver.getLast_barcode();
-                if(Objects.isNull(barcode)){
+                barcode = hailiangLetteringPackageSsxDeviceDriver.getLast_barcode();
+                if(ObjectUtil.isEmpty(barcode)){
                     message = "单次码垛完成,取货位:"+getDeviceCode+"条码为空";
                     return false;
                 }
                 lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"单次码垛完成，取货位:"+getDeviceCode+",条码:"+barcode));
-                barcodeArr.add(barcode);
+            }
+
+            if(putDevice.getDeviceDriver() instanceof HailiangOldPalletizingStationDriver ) {
+                hailiangOldPalletizingStationDriver = (HailiangOldPalletizingStationDriver) putDevice.getDeviceDriver();
+                JSONArray arr = hailiangOldPalletizingStationDriver.getBarcodeArr();
+                arr.add(barcode.trim());
+                hailiangOldPalletizingStationDriver.setBarcodeArr(arr);
             }
 
             this.writing("to_feedback", "2");
+            this.writing("to_boxType", "0");
             this.setSinglePlacementRequireSuccess(true);
         }
         return true;
@@ -393,22 +404,34 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
             List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_device_code");
             //根据kep读取到的放货工位的值 - 1 得到对应设备的下标,再根据下标获得对应设备的编码
             String putDeviceCode = putDeviceCodeList.get(getPutStation() - 1).replace("\"", "");
+            HailiangOldPalletizingStationDriver hailiangOldPalletizingStationDriver;
+            Device putDevice = deviceAppservice.findDeviceByCode(putDeviceCode);
+            JSONArray ja = null;
+            if(putDevice.getDeviceDriver() instanceof HailiangOldPalletizingStationDriver ) {
+                hailiangOldPalletizingStationDriver = (HailiangOldPalletizingStationDriver) putDevice.getDeviceDriver();
+                ja = hailiangOldPalletizingStationDriver.getBarcodeArr();
+                lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"码垛完成ja:"+ja.toString()));
+            }
             JSONObject map = new JSONObject();
             map.put("device_code", putDeviceCode);
             map.put("encoder_qty", String.valueOf(getEncoder_qty()));
             map.put("boxtype", String.valueOf(getBoxtype()));
-            map.put("barcodeArr",barcodeArr);
+            map.put("barcodeArr", String.valueOf(ja));
             map.put("id", IdUtil.simpleUUID());
-            JSONObject resp = acsToWmsService.stackingCompleted(map);
-            int code = Integer.parseInt(resp.getString("code"));
-            String message = resp.getString("message");
-            JSONObject data = resp.getJSONObject("data");
-            if (code == 200) {
-                this.writing("to_feedback", "3");
-                this.setStackingRequireSuccess(true);
-            } else {
-                log.warn("码垛完成反馈失败!设备号:{},原因{}", device_code, message);
-            }
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"码垛完成反馈:"+map));
+
+//            JSONObject resp = acsToWmsService.stackingCompleted(map);
+//            int code = Integer.parseInt(resp.getString("code"));
+//            String message = resp.getString("message");
+//            JSONObject data = resp.getJSONObject("data");
+//            if (code == 200) {
+//                this.writing("to_feedback", "3");
+//                this.setStackingRequireSuccess(true);
+//            } else {
+//                log.warn("码垛完成反馈失败!设备号:{},原因{}", device_code, message);
+//            }
+            this.writing("to_feedback", "3");
+            this.setStackingRequireSuccess(true);
         }
         return true;
     }
@@ -435,16 +458,18 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
         Map<String, Object> itemMap = new HashMap<String, Object>();
         itemMap.put(to_param, Integer.parseInt(value));
         ReadUtil.write(itemMap, server);
+        server.disconnect();
     }
 
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
         jo.put("device_name", this.getDevice().getDevice_name());
-        jo.put("mode", mode == 1 ? "联机" : "未联机");
+        jo.put("mode", mode == 2 ? "联机" : "未联机");
         jo.put("action", action);
         jo.put("error", ErrorUtil.getDictDetail("jxs_error_type", String.valueOf(error)));
-        jo.put("barcodeArr", barcodeArr);
+        jo.put("getStation", this.itemProtocol.getGetStation());
+        jo.put("putStation", this.itemProtocol.getPutStation());
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("message", message);
         return jo;
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
index 1b22675e..d5e27a8b 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
@@ -129,11 +129,12 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
+        jo.put("device_code", this.getDevice().getDevice_code());
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("mode", mode == 1 ? "联机" : "未联机");
         jo.put("error", ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
         jo.put("qty", qty);
-        jo.put("status", this.itemProtocol.getStatus()==1 ? "未知":"工作中");
+        jo.put("status", this.itemProtocol.getStatus()== 0 ? "未知":"工作中");
         jo.put("one_qty", this.itemProtocol.getOne_qty());
         jo.put("two_qty", this.itemProtocol.getTwo_qty());
         jo.put("three_qty", this.itemProtocol.getThree_qty());
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
index 6782b258..ef24be19 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
@@ -246,6 +246,7 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement
     @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
+        jo.put("device_code", this.getDevice().getDevice_code());
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("isOnline", this.itemProtocol.getIsonline());
         return jo;
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
index b2680b73..7d1b2e28 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
@@ -13,6 +13,8 @@ import org.nl.acs.opc.WcsConfig;
 import org.nl.acs.udw.UnifiedDataAccessor;
 import org.nl.acs.udw.UnifiedDataAccessorFactory;
 import org.nl.acs.udw.UnifiedDataAppService;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
 import org.nl.modules.wql.exception.WDKException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -144,6 +146,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
      * @param value
      */
     public void writing(String key, String value) {
+        LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
         DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
         String opcServerId = this.getDevice().getOpc_server_id();
         Server server = ReadUtil.getServer(opcServerId);
@@ -151,6 +154,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
         itemMap.put(getToParam() + key, value);
         ReadUtil.write(itemMap, server);
         server.disconnect();
+        lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(),"下发单个电气信号:" + key + ",下发电气信号值:" + value));
         logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发单个电气信号:" + key + ",下发电气信号值:" + value);
     }
 
@@ -162,6 +166,8 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
      */
     public void writing(Map<String, Object> map) {
         DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
+        LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
+
         Map<String, Object> itemMap = new HashMap<String, Object>();
         map.forEach((key, value) -> {
             if (ObjectUtil.isNotEmpty(value)) {
@@ -170,6 +176,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
         });
         if (ObjectUtil.isNotEmpty(itemMap)) {
             this.control(itemMap);
+            lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(),"下发多个电气信号:" + itemMap));
             logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap);
         }
     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 601d1cc9..7ea25f40 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -412,11 +412,14 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
         Object obj = accessor_value.getValue(relate);
         sb.append("key:" + relate + "value:" + obj + ";");
       }
-      lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".")+1), String.valueOf(his), String.valueOf(value)));
+      if (!itemDto.getItem_code().endsWith("heartbeat")) {
+        lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".")+1), String.valueOf(his), String.valueOf(value)));
+      }
 
     } else {
-
-      lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".")+1), String.valueOf(his), String.valueOf(value)));
+      if (!itemDto.getItem_code().endsWith("heartbeat")) {
+        lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".")+1), String.valueOf(his), String.valueOf(value)));
+      }
 
     }
   }
diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
index f6ab9efc..3130ac08 100644
--- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
+++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_old/hailiang_old_package_ssx_station.vue
@@ -67,8 +67,8 @@
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="检验有货">
-              <el-switch v-model="form.inspect_in_stocck" />
+            <el-form-item label="开启扫码">
+              <el-switch v-model="form.open_scanner" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
diff --git a/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue b/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
index 14249508..e69de29b 100644
--- a/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
+++ b/wcs/nladmin-ui/src/views/acs/monitor/device/index.vue
@@ -1,601 +0,0 @@
-<template>
-  <div class="monitor-wrap">
-    <el-row style="margin-top: 20px;margin-left: 20px;margin-bottom: 20px">
-      <el-col :span="6" />
-      <el-col :span="18">
-        <!-- 舞台:
-         <el-select v-model="stage_code" placeholder="请选择" @change="changeStage">
-           <el-option
-             v-for="item in stageSelectList"
-             :key="item.stage_code"
-             :label="item.stage_name"
-             :value="item.stage_code">
-           </el-option>
-         </el-select>
-         <el-button type="primary" @click="saveAll" :loading="saveLoading">保存</el-button>
-         <el-button type="success" @click="cleanArr2">清空</el-button>-->
-        <!-- <el-button type="info">操作</el-button>-->
-      </el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="1" style="margin-left: 10px">
-        <div>
-          <!-- <draggable :list="arr1" animation="300"
-                      dragClass="dragClass"
-                      ghostClass="ghostClass"
-                      chosenClass="chosenClass"
-                      @start="onStart"
-                      @end="onEnd"
-                      :move="onMove"
-                      :group="{ name:'group', pull:'clone', put:false}"
-           >
-
-             &lt;!&ndash;vue中引入图片https://blog.csdn.net/qq_35393869/article/details/80333564&ndash;&gt;
-             <div v-for="(item,index) in arr1" :key="index"
-                  style="position: relative; width: 34px;height: 34px;display: inline-block;margin: 0 0 0 0 ;vertical-align:bottom;outline: 1px solid #f0f0f0;">
-               <img :src="require('../../../../assets/acs/' +item.img1+'.png')" alt="" width="34px" height="34px;"
-                    style="margin: 0 0 0 0;vertical-align:bottom;transform: rotate(0deg);"/>
-
-             </div>
-
-           </draggable>-->
-        </div>
-      </el-col>
-
-      <el-col :span="22" style="margin-left: 30px">
-        <el-scrollbar style="width:1850px;height: 1050px;">
-          <!--使用draggable组件-->
-          <draggable
-            :list="arr2"
-            group="group"
-            animation="300"
-            filter=".forbid"
-            :style="'width:'+ grid_width +'px;'"
-          >
-
-            <div
-              v-for="(item) in arr2"
-              :key="item.index"
-              class="forbid"
-              style="position: relative; width: 34px;height: 34px;display: inline-block;margin: 0 0 0 0 ;vertical-align:bottom;"
-              @click="clickDevice(item)"
-            >
-
-              <el-popover
-                v-if="currentItem == item.index"
-                :ref="'pop_'+item.index"
-                placement="bottom"
-                effect="dark"
-                trigger="manual"
-                :value="currentItem == item.index"
-                :disabled="item.device_code == ''"
-                :popper-class="isErrorColor(item)"
-              >
-                <div v-if="item.device_code !== ''" style="height: 390px;overflow-y: auto">
-                  <div style="padding: 3px;">
-                    设备信息
-                  </div>
-                  <el-table
-                    :data="moveShow(item)"
-                    style="width: 100%"
-                  >
-                    <af-table-column
-                      prop="name"
-                      label="监控项"
-                    />
-                    <af-table-column
-                      prop="value"
-                      label="当前值"
-                    />
-                  </el-table>
-                </div>
-              </el-popover>
-
-              <div v-popover="'pop_'+item.index" class="content" @mouseover="changeCurrentTime(item)">
-                <img
-                  :src="require('../../../../assets/acs/' +item.img2+'.png')"
-                  alt=""
-                  width="34px"
-                  height="34px;"
-                  :style="{ transform:' rotate('+item.angle+'deg)' }"
-                  style="outline: 1px solid #f0f0f0;"
-                >
-                <img
-                  v-if="hasGoods(item) && item.img2!='1' "
-                  :src="require('../../../../assets/acs/' +'托盘'+'.png')"
-                  style="position: absolute; top: 5px;right: 5px;width: 24px;height: 24px;"
-                >
-                <img
-                  v-if="statusPic(item) && item.img2!='1'"
-                  :src="require('../../../../assets/acs/' +'status0'+'.png')"
-                  style="position: absolute; top: 0;left: 0;"
-                >
-                <img
-                  v-if="!statusPic(item) && item.img2!='1' && item.device_code"
-                  :src="require('../../../../assets/acs/' +'status1'+'.png')"
-                  style="position: absolute; top: 0;left: 0;"
-                >
-                <img
-                  v-if="isError(item)"
-                  :src="require('../../../../assets/acs/' +'icon_alert'+'.png')"
-                  style="position: absolute; top: 5px;right: 5px;width: 23px;height: 23px;"
-                >
-              </div>
-            </div>
-          </draggable>
-        </el-scrollbar>
-      </el-col>
-    </el-row>
-
-    <!--弹窗设置设备与图标绑定与角度-->
-    <el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
-      <el-form :model="form" size="small">
-        <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true" />
-        </el-form-item>
-
-        <el-form-item label="设备状态" label-width="80px">
-          <el-radio-group v-model="form.option">
-            <el-radio-button :label="0">禁止进出</el-radio-button>
-            <el-radio-button :label="1">允许进入</el-radio-button>
-            <el-radio-button :label="2">允许离开</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogSave">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!--弹窗设置设备与图标绑定与角度-->
-    <el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
-      <el-form :model="form" size="small">
-        <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="设备状态" label-width="80px">
-          <el-radio-group v-model="form.hasGoodStatus">
-            <el-radio-button :label="0">无货</el-radio-button>
-            <el-radio-button :label="1">空料斗</el-radio-button>
-            <el-radio-button :label="2">满料斗</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="物料编码" prop="material_type" label-width="80px">
-          <el-input v-model="form.material_type" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible3 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogSave">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!--弹窗设置设备与图标绑定与角度-->
-    <el-dialog title="设备设置" :visible.sync="dialogFormVisible4" width="35%">
-      <el-form :model="form" size="small">
-        <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="缺料请求成功" prop="requireSucess" label-width="120px">
-          <el-radio-group v-model="form.requireSucess">
-            <el-radio-button :label="0">否</el-radio-button>
-            <el-radio-button :label="1">是</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="空想请求成功" prop="fullrequireSucess" label-width="120px">
-          <el-radio-group v-model="form.fullrequireSucess">
-            <el-radio-button :label="0">否</el-radio-button>
-            <el-radio-button :label="1">是</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible4 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogSave">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!--弹窗设置设备与图标绑定与角度-->
-    <el-dialog title="设备设置" :visible.sync="dialogFormVisible1" width="35%">
-      <el-form :model="form" size="small">
-        <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true" />
-        </el-form-item>
-
-        <el-form-item label="条码" label-width="80px">
-          <el-input v-model="form.barcode" :disabled="false" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible1 = false">取 消</el-button>
-        <el-button type="primary" @click="saveBarcode">确 定</el-button>
-      </div>
-    </el-dialog>
-    <XJDeviceMonitor ref="child1" />
-  </div>
-</template>
-
-<script>
-// 导入draggable组件
-import deviceCrud from '@/api/acs/device/device'
-import draggable from 'vuedraggable'
-import crud from '@/mixins/crud'
-import actorCrud from '@/api/acs/stage/actor'
-import XJDeviceMonitor from '@/views/acs/monitor/device/XJDeviceMonitor'
-
-export default {
-  name: 'MonitorDevice',
-  // 注册draggable组件
-  components: {
-    draggable, XJDeviceMonitor
-  },
-  mixins: [crud],
-  data() {
-    return {
-      stage_code: '',
-      dialogFormVisible: false,
-      dialogFormVisible1: false,
-      dialogFormVisible2: false,
-      dialogFormVisible3: false,
-      dialogFormVisible4: false,
-      arr2: [],
-      currentItem: '',
-      stageSelectList: [],
-      deviceList: [],
-      form: {
-        index: 0,
-        device_code: '',
-        angle: 0,
-        hasGoodStatus: null,
-        barcode: '',
-        suspended: null,
-        material_type: '',
-        requireSucess: '',
-        fullrequireSucess: ''
-      },
-      grid_width: 1000
-    }
-  },
-  created() {
-    this.initArr2()
-    this.webSocket()
-  },
-  methods: {
-    clickDevice(item) {
-      // debugger
-      const index = item.index
-      const clickObj = this.arr2[index]
-      console.log(clickObj.data)
-      if (!clickObj.img2 || clickObj.img2 === '1' || !item.data) {
-        return
-      }
-      if (clickObj.data.is_click !== true) {
-        return
-      }
-      if (clickObj.data.device_type === 'scanner') {
-        this.dialogFormVisible1 = true
-      } else {
-        if (clickObj.data.driver_type === 'hailiang_engraving_cache') {
-          this.dialogFormVisible3 = true
-        } else if (clickObj.data.driver_type === 'hailiang_packer_station') {
-          this.dialogFormVisible4 = true
-        } else if (clickObj.data.driver_type === 'hailiang_xj_plc_test') {
-          this.$refs.child1.setForm(clickObj)
-        } else {
-          this.dialogFormVisible = true
-        }
-      }
-      this.form.angle = clickObj.angle
-      this.form.index = clickObj.index
-      this.form.device_code = clickObj.device_code
-      this.form.hasGoodStatus = clickObj.data.hasGoods
-      this.form.material_type = clickObj.data.material_type
-      this.form.requireSucess = clickObj.data.requireSucess
-      this.form.fullrequireSucess = clickObj.data.fullrequireSucess
-    },
-    hasGoods(item) {
-      if (item.data && item.data.hasGoods > 0) {
-        return true
-      }
-      return false
-    },
-    statusPic(item) {
-      if (item.data && item.data.isOnline === true) {
-        return true
-      }
-      return false
-    },
-    isError(item) {
-      if (item.data && item.data.isError === true) {
-        return true
-      }
-      return false
-    },
-    isErrorColor(item) {
-      if (item.data && item.data.isError === true) {
-        return 'error'
-      }
-      return 'normal'
-    },
-    changeCurrentTime(item) {
-      this.currentItem = item.index
-    },
-    moveShow(item) {
-      // debugger
-      if (item.device_code && item.data) {
-        const arr = [
-          { name: '设备编号', value: item.device_code },
-          { name: '设备名称', value: item.device_name }
-        ]
-        const data = item.data
-        for (const val in data) {
-          if (val === 'isOnline' || val === 'isError' || val === 'hasGoods') {
-            continue
-          }
-          if (val === 'message' && data.isError === true) {
-            const obj = { name: '设备信息', value: data[val] }
-            arr.push(obj)
-          }
-
-          if (val === 'message' && data.isError === 'false') {
-            const obj = { name: '异常信息', value: data[val] }
-            arr.push(obj)
-          }
-
-          if (val === 'move') {
-            const obj = { name: '光电信号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'mode') {
-            const obj = { name: '模式', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'error') {
-            const obj = { name: '报警', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'ip') {
-            const obj = { name: 'IP地址', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'number') {
-            const obj = { name: '托盘数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'qty') {
-            const obj = { name: '数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'weight') {
-            const obj = { name: '重量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'instruction_message') {
-            const obj = { name: '指令信息', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'last_instruction_message') {
-            const obj = { name: '上次指令信息', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'container') {
-            const obj = { name: '载具号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'last_container') {
-            const obj = { name: '上次载具号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'instruction_code') {
-            const obj = { name: '指令号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'last_instruction_code') {
-            const obj = { name: '上次指令号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'action') {
-            const obj = { name: '动作信号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'io_action') {
-            const obj = { name: '允许进出信号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'material') {
-            const obj = { name: '物料', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'batch') {
-            const obj = { name: '批次', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'requestSucess') {
-            const obj = { name: '缺料请求成功', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'applySucess') {
-            const obj = { name: '是否申请指令', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'message') {
-            const obj = { name: '说明', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'phase') {
-            const obj = { name: 'AGV交互阶段', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'option') {
-            const obj = { name: 'AGV动作', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'temperature') {
-            const obj = { name: '当前温度', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'finish') {
-            const obj = { name: '烘箱完成', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'countdown_house') {
-            const obj = { name: '恒温倒计时(时)', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'countdown_min') {
-            const obj = { name: '恒温倒计时(分)', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'countdown_sec') {
-            const obj = { name: '恒温倒计时(秒)', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'task') {
-            const obj = { name: '任务号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'door') {
-            const obj = { name: '门状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'address') {
-            const obj = { name: 'agv位置', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'phaseName') {
-            const obj = { name: 'phase', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'is_disable') {
-            const obj = { name: '是否禁用', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'one_qty') {
-            const obj = { name: '1号口数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'two_qty') {
-            const obj = { name: '2号口数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'three_qty') {
-            const obj = { name: '3号口数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'four_qty') {
-            const obj = { name: '4号口数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'five_qty') {
-            const obj = { name: '5号口数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'one_status') {
-            const obj = { name: '1号口状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'two_status') {
-            const obj = { name: '2号口状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'three_status') {
-            const obj = { name: '3号口状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'four_status') {
-            const obj = { name: '4号口状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'five_status') {
-            const obj = { name: '5号口状态', value: data[val] }
-            arr.push(obj)
-          }
-        }
-        return arr
-      }
-    },
-    dialogSave() {
-      deviceCrud.changeDeviceStatus(this.form).then(res => {
-        this.notify('操作成功', 'success')
-        this.dialogFormVisible = false
-        this.dialogFormVisible3 = false
-        this.dialogFormVisible4 = false
-        this.initArr2()
-      }).catch(err => {
-        this.dialogFormVisible = false
-        this.dialogFormVisible3 = false
-        this.dialogFormVisible4 = false
-        console.log(err.response.data.message)
-      })
-    },
-    statusSave() {
-      deviceCrud.changeFenceStatus(this.form).then(res => {
-        this.notify('操作成功', 'success')
-        this.dialogFormVisible2 = false
-        this.initArr2()
-      }).catch(err => {
-        this.dialogFormVisible2 = false
-        console.log(err.response.data.message)
-      })
-    },
-    saveBarcode() {
-      deviceCrud.saveBarcode(this.form).then(res => {
-        this.notify('操作成功', 'success')
-        this.dialogFormVisible1 = false
-        this.initArr2()
-      }).catch(err => {
-        this.dialogFormVisible1 = false
-        console.log(err.response.data.message)
-      })
-    },
-    initArr2() {
-      actorCrud.queryStageActor('SHDP').then(data => {
-        if (data.detail.length > 0) {
-          this.grid_width = data.form.grid_width
-          this.arr2 = []
-          for (let i = 0; i < data.form.grid_length; i++) {
-            const a = { 'id': i, 'name': '', device_code: '', img: '', index: i, img2: '1', angle: '0' }
-            this.arr2.push(a)
-          }
-          for (const i of data.detail) {
-            const index = i.index
-            this.arr2.splice(index, 1, i)
-          }
-        }
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    webSocket() {
-      const that = this
-      if (typeof (WebSocket) === 'undefined') {
-        this.$notify({
-          title: '提示',
-          message: '当前浏览器无法接收实时报警信息，请使用谷歌浏览器！',
-          type: 'warning',
-          duration: 0
-        })
-      } else {
-        const id = 'device_monitor'
-        // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改
-        // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送
-
-        // const wsUri = process.env.VUE_APP_WS_API + '/webSocket/' + id
-        const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/' + id
-        this.socket = new WebSocket(wsUri)
-        // 监听socket打开
-        this.socket.onopen = function() {
-          console.log('浏览器WebSocket已打开')
-          // that.socket.send('测试客户端发送消息')
-        }
-
-        // 监听socket消息接收
-        this.socket.onmessage = function(msg) {
-          const list = JSON.parse(msg.data).msg.detail
-          // console.log(list)
-
-          for (const item of list) {
-            const index = item.index
-            // that.arr2.splice(index, 1, item)
-
-            if (item.data) {
-              Object.assign(that.arr2[index].data, item.data)
-            }
-          }
-        }
-
-        // 监听socket错误
-        this.socket.onerror = function() {
-          that.$notify({
-            title: '错误',
-            message: '服务器错误，无法接收实时报警信息',
-            type: 'error',
-            duration: 0
-          })
-        }
-        // 监听socket关闭
-        this.socket.onclose = function() {
-          console.log('WebSocket已关闭')
-        }
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.normal {
-  background: #4a659c !important;
-}
-
-.error {
-  background: #95341c !important;
-}
-
-</style>
-<style>
-
-.monitor-wrap .el-popover {
-  margin-left: 35px;
-}
-</style>
diff --git a/wcs/nladmin-ui/src/views/acs/order/index.vue b/wcs/nladmin-ui/src/views/acs/order/index.vue
index 047f7d4a..504b9dca 100644
--- a/wcs/nladmin-ui/src/views/acs/order/index.vue
+++ b/wcs/nladmin-ui/src/views/acs/order/index.vue
@@ -135,6 +135,27 @@
           <el-form-item label="开箱机编号" prop="unboxing_device_code">
             <el-input v-model="form.unboxing_device_code" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="箱型" prop="unboxing_device_code">
+            <el-input v-model="form.box_type" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="巷道" prop="unboxing_device_code">
+            <el-input v-model="form.target_roadway" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="每箱包数" prop="unboxing_device_code">
+            <el-input v-model="form.one_box_package_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="每包数量" prop="unboxing_device_code">
+            <el-input v-model="form.one_package_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="总箱数" prop="unboxing_device_code">
+            <el-input v-model="form.box_num" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="总袋数" prop="unboxing_device_code">
+            <el-input v-model="form.package_qty" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="是否翻转" prop="unboxing_device_code">
+            <el-input v-model="form.is_flip" style="width: 370px;" />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -173,7 +194,14 @@
         <el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip />
         <el-table-column prop="is_used_fxx" label="启用封箱线" min-width="100" show-overflow-tooltip />
         <el-table-column prop="ealing_device_code" label="装箱机编号" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="unboxing_device_code" label="开箱机编号" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="box_type" label="箱型" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="target_roadway" label="巷道" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="one_box_package_qty" label="每箱包数" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="one_package_qty" label="每包数量" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="box_num" label="箱数" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="tray_full_num" label="托盘满托数量" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="package_qty" label="总袋数" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="is_flip" label="是否翻转" min-width="100" show-overflow-tooltip />
         <el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip />
         <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
       </el-table>
@@ -214,7 +242,15 @@ const defaultForm = {
   in_devices: '',
   is_used_fxx: '0',
   ealing_device_code: '',
-  unboxing_device_code: ''
+  unboxing_device_code: '',
+  one_box_package_qty: '',
+  one_package_qty: '',
+  box_num: '',
+  box_type: '',
+  target_roadway: '',
+  tray_full_num: '',
+  package_qty: '',
+  is_flip: ''
 }
 export default {
   name: 'Produceshiftorder',
diff --git a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
index fbc1e428..34f47732 100644
--- a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -684,6 +684,48 @@ export default {
           } else if (val === 'agv_take_finish') {
             const obj = { name: '满箱已运出满箱位', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'one_qty') {
+            const obj = { name: '1号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_qty') {
+            const obj = { name: '2号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_qty') {
+            const obj = { name: '3号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'four_qty') {
+            const obj = { name: '4号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'five_qty') {
+            const obj = { name: '5号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_status') {
+            const obj = { name: '1号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_status') {
+            const obj = { name: '2号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_status') {
+            const obj = { name: '3号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'four_status') {
+            const obj = { name: '4号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'five_status') {
+            const obj = { name: '5号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'boxType') {
+            const obj = { name: '箱型', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'getStation') {
+            const obj = { name: '取货位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'putStation') {
+            const obj = { name: '放货位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'barcodeArr') {
+            const obj = { name: '码垛条码', value: data[val] }
+            this.arr.push(obj)
           }
         }
       }