diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java
index 07aeb08..b5b852f 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementOrderService.java
@@ -49,33 +49,47 @@ public interface YysMaterialProcurementOrderService extends IService<YysMaterial
      * @return
      */
     List<YysMaterialProcurementOrderEntity> queryList(YysMaterialProcurementOrderPagination queryBody);
+
     /**
      * 缺货结单-App
      *
-     * @param queryNo
-     * @return
+     * @param request
      */
-    Void noGoods(YysMaterialProcurementOrderRequest queryNo);
+    void finish(YysMaterialProcurementOrderRequest request);
+
     /**
      * 延迟发货-App
      *
-     * @param queryDelay
-     * @return
+     * @param request
      */
-    List<YysMaterialProcurementOrderEntity> delayGoods(YysMaterialProcurementOrderRequest queryDelay);
+    void delay(YysMaterialProcurementOrderRequest request);
 
     /**
      * 点击发货-App
      *
-     * @param querySend
-     * @return
+     * @param request
      */
-    List<YysMaterialProcurementOrderEntity> sendGoods(YysMaterialProcurementOrderRequest querySend);
+    String shipments(YysMaterialProcurementOrderRequest request);
+
     /**
      * 点击投产-App
      *
-     * @param queryTc
+     * @param request
+     */
+    String toProd(YysMaterialProcurementOrderRequest request);
+
+    /**
+     * 接单
+     *
+     * @param orderNumber
+     */
+    void takeOrder(String orderNumber);
+
+    /**
+     * 确认到货
+     *
+     * @param request
      * @return
      */
-    List<YysMaterialProcurementOrderEntity> operation(YysMaterialProcurementOrderRequest queryTc);
+    String confirmQuantity(YysMaterialProcurementOrderRequest request);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java
index 79cdbf2..f83995f 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementOrderServiceImpl.java
@@ -1,50 +1,39 @@
 package jnpf.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import jnpf.entity.*;
-import jnpf.mapper.YysMaterialProcurementOrderMapper;
-import jnpf.service.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.base.UserInfo;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import jnpf.entity.YysMaterialProcurementOrderEntity;
+import jnpf.mapper.YysMaterialProcurementOrderMapper;
+import jnpf.model.QueryModel;
 import jnpf.model.yysmaterialprocurementorder.*;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.YysMaterialProcurementItemService;
+import jnpf.service.YysMaterialProcurementOrderService;
+import jnpf.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-
-import cn.hutool.core.util.ObjectUtil;
-import jnpf.util.GeneraterSwapUtil;
-
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import jnpf.model.QueryModel;
-
 import java.util.stream.Collectors;
 
-import jnpf.base.model.ColumnDataModel;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.database.model.superQuery.SuperJsonModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import jnpf.util.*;
-
-import java.util.*;
-
-import jnpf.base.UserInfo;
-import jnpf.permission.entity.UserEntity;
-
-import javax.annotation.Resource;
-
 /**
  * YysMaterialProcurementOrder
  * 版本： V3.5
@@ -258,6 +247,7 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl<YysMater
             List<String> finalAllRuleIDlist = allRuleIDlist;
             yysMaterialProcurementOrderQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementOrderEntity::getId, finalAllRuleIDlist));
         }
+        yysMaterialProcurementOrderQueryWrapper.lambda().ne(YysMaterialProcurementOrderEntity::getOrderStatus, ProcurementOrderStatusEnum.TO_PRODUCTION.getCode());
         //假删除标志
         yysMaterialProcurementOrderQueryWrapper.lambda().isNull(YysMaterialProcurementOrderEntity::getDeleteMark);
 
@@ -388,6 +378,7 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl<YysMater
             entity.setOrderNumber("PO" + currentDate + number);
             entity.setCreatorTime(DateUtil.getNowDate());
             entity.setCreatorUserId(userProvider.get().getUserId());
+            entity.setOrderStatus(ProcurementOrderStatusEnum.NO_ORDERS_TAKEN.getCode());
             return entity;
         }).collect(Collectors.toList());
         boolean result = this.saveBatch(collect);
@@ -412,29 +403,153 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl<YysMater
             wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, queryBody.getOrderNumber());
         }
         wrapper.eq(YysMaterialProcurementOrderEntity::getOrderStatus, queryBody.getOrderStatus());
+        wrapper.ne(YysMaterialProcurementOrderEntity::getOrderStatus, ProcurementOrderStatusEnum.TO_PRODUCTION.getCode());
         wrapper.isNull(YysMaterialProcurementOrderEntity::getDeleteMark);
         return this.list(wrapper);
     }
-    public Void noGoods(YysMaterialProcurementOrderRequest queryNo) {
-        log.info("点击缺货结单-app");
 
+    @Override
+    public void finish(YysMaterialProcurementOrderRequest request) {
+        log.info("app-缺货结单，采购订单信息：{}", request);
+        if (ObjectUtil.isNull(request)) {
+            return;
+        }
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, request.getOrderNumber());
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        entity.setOrderStatus(ProcurementOrderStatusEnum.OUT_OF_STOCK_STATEMENTS.getCode());
+        this.updateById(entity);
+    }
 
-        return null;
+    @Override
+    public void delay(YysMaterialProcurementOrderRequest request) {
+        log.info("app-延期交货，采购订单信息：{}", request);
+        if (ObjectUtil.isNull(request)) {
+            return;
+        }
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, request.getOrderNumber());
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        if (ObjectUtil.isNull(entity)) {
+            return;
+        }
+        entity.setOrderStatus(ProcurementOrderStatusEnum.PARTIAL_SHIPMENT.getCode());
+        entity.setDelayedDeliveryDate(request.getExpectedSendTime());
+        entity.setDelayReason(request.getExtensionReason());
+        this.updateById(entity);
     }
 
     @Override
-    public List<YysMaterialProcurementOrderEntity> delayGoods(YysMaterialProcurementOrderRequest queryDelay) {
-        return null;
+    public String shipments(YysMaterialProcurementOrderRequest request) {
+        log.info("app-发货，采购订单信息：{}", request);
+        if (ObjectUtil.isNull(request) || ObjectUtil.isNull(request.getOrderNumber())) {
+            return "发货失败，订单号为空";
+        }
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, request.getOrderNumber());
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        if (ObjectUtil.isNull(entity)) {
+            return "发货失败，订单不存在";
+        }
+        BigDecimal totalSendQuantity = entity.getTotalSendQuantity() != null ? entity.getTotalSendQuantity() : BigDecimal.ZERO;
+        BigDecimal newTotalSendQuantity = totalSendQuantity.add(request.getSendNumber());
+        int flag = 0;
+        if (newTotalSendQuantity.compareTo(entity.getOrderQuantity()) == 0) {
+            entity.setOrderStatus(ProcurementOrderStatusEnum.ALL_SHIPPED.getCode());
+            flag = 1;
+        } else {
+            entity.setOrderStatus(ProcurementOrderStatusEnum.PARTIAL_SHIPMENT.getCode());
+        }
+        entity.setTotalSendQuantity(newTotalSendQuantity);
+        boolean result = this.updateById(entity);
+        if (result) {
+            //部分发货
+            if (flag == 0) {
+                CompletableFuture.runAsync(() -> {
+                    String mainId = RandomUtil.uuId();
+                    entity.setId(mainId);
+                    entity.setOrderStatus(ProcurementOrderStatusEnum.SHIPPED.getCode());
+                    entity.setBatchDeliveryDate(request.getSendTime());
+                    entity.setBatchShipmentQuantity(request.getSendNumber());
+                    //获取采购订单号最新编码号
+                    int newOrderNum = this.getNewOrderNum(entity.getOrderNumber());
+                    entity.setOrderNumber(entity.getOrderNumber() + "-" + newOrderNum);
+                    this.save(entity);
+                });
+            }
+            return "发货成功";
+        }
+        return "发货失败";
     }
 
     @Override
-    public List<YysMaterialProcurementOrderEntity> sendGoods(YysMaterialProcurementOrderRequest querySend) {
-        return null;
+    public String toProd(YysMaterialProcurementOrderRequest request) {
+        log.info("app-投产，采购订单信息：{}", request);
+        if (ObjectUtil.isNull(request)) {
+            return "填写信息有误";
+        }
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, request.getOrderNumber());
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        if (ObjectUtil.isNull(entity)) {
+            return "投产失败，订单不存在";
+        }
+        entity.setProductionDate(request.getProductionTime());
+        if (ObjectUtil.isNull(entity.getTotalProductionQuantity())) {
+            entity.setTotalProductionQuantity(request.getProductionNumber());
+        } else {
+            entity.setTotalProductionQuantity(request.getProductionNumber().add(entity.getTotalProductionQuantity()));
+        }
+        boolean result = this.updateById(entity);
+        if (result) {
+            CompletableFuture.runAsync(() -> {
+                //添加投产记录一条  列表中不展示
+                String mainId = RandomUtil.uuId();
+                entity.setId(mainId);
+                entity.setTotalProductionQuantity(request.getProductionNumber());
+                entity.setOrderStatus(ProcurementOrderStatusEnum.TO_PRODUCTION.getCode());
+                //获取采购订单号最新编码号
+                int newOrderNum = this.getNewOrderNum(entity.getOrderNumber());
+                entity.setOrderNumber(entity.getOrderNumber() + "-" + newOrderNum);
+                this.save(entity);
+            });
+            return "投产成功";
+        }
+        return "投产失败";
+    }
+
+    @Override
+    public void takeOrder(String orderNumber) {
+        log.info("app-接单，采购订单号：{}", orderNumber);
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, orderNumber);
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        if (ObjectUtil.isNull(entity)) {
+            return;
+        }
+        entity.setOrderStatus(ProcurementOrderStatusEnum.ORDERS_TAKEN.getCode());
+        this.updateById(entity);
     }
 
     @Override
-    public List<YysMaterialProcurementOrderEntity> operation(YysMaterialProcurementOrderRequest queryTc) {
-        return null;
+    public String confirmQuantity(YysMaterialProcurementOrderRequest request) {
+        log.info("确认到货，采购订单号:{}", request.getOrderNumber());
+        if (ObjectUtil.isNull(request)) {
+            return "填写信息有误";
+        }
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysMaterialProcurementOrderEntity::getOrderNumber, request.getOrderNumber());
+        YysMaterialProcurementOrderEntity entity = this.getOne(wrapper);
+        if (ObjectUtil.isNull(entity)) {
+            return "数据不存在";
+        }
+        entity.setConfirmQuantityReceived(request.getConfirmQuantity());
+        entity.setOrderStatus(ProcurementOrderStatusEnum.ARRIVED.getCode());
+        boolean result = this.updateById(entity);
+        if (result) {
+            return "确认到货成功";
+        }
+        return "确认到货失败";
     }
 
     private int getNewNum() {
@@ -458,4 +573,15 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl<YysMater
         String number = max.getOrderNumber().replace("PO", "").replace(currentDate, "");
         return Integer.parseInt(number) + 1;
     }
+
+    private int getNewOrderNum(String orderNumber) {
+        LambdaQueryWrapper<YysMaterialProcurementOrderEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(YysMaterialProcurementOrderEntity::getOrderNumber, orderNumber);
+        wrapper.isNull(YysMaterialProcurementOrderEntity::getDeleteMark);
+        List<YysMaterialProcurementOrderEntity> list = this.list(wrapper);
+        if (CollectionUtils.isEmpty(list) || list.size() == 1) {
+            return 1;
+        }
+        return list.size();
+    }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java
index b3b9ade..2e4a5ff 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementOrderController.java
@@ -14,6 +14,7 @@ import jnpf.util.*;
 import jnpf.model.yysmaterialprocurementorder.*;
 import lombok.extern.slf4j.Slf4j;
 import oracle.jdbc.proxy.annotation.Post;
+import org.apache.ibatis.type.NStringTypeHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -404,27 +405,57 @@ public class YysMaterialProcurementOrderController {
         }
         return ActionResult.fail(result);
     }
-    @Operation(summary = "点击投产-App")
-    @PostMapping("/operation")
-    public ActionResult operation(@RequestBody YysMaterialProcurementOrderRequest queryTc) {
-        return ActionResult.success(yysMaterialProcurementOrderService.operation(queryTc));
+
+    @Operation(summary = "投产-App")
+    @PostMapping("/toProd")
+    public ActionResult toProd(@RequestBody YysMaterialProcurementOrderRequest request) {
+        String result = yysMaterialProcurementOrderService.toProd(request);
+        if (result.contains("成功")) {
+            return ActionResult.success(result);
+        }
+        return ActionResult.fail(result);
     }
-    @Operation(summary = "点击发货-App")
-    @PostMapping("/sendGoods")
-    public ActionResult sendGoods(@RequestBody YysMaterialProcurementOrderRequest querySend) {
-        return ActionResult.success(yysMaterialProcurementOrderService.sendGoods(querySend));
+
+    @Operation(summary = "发货-App")
+    @PostMapping("/shipments")
+    public ActionResult shipments(@RequestBody YysMaterialProcurementOrderRequest request) {
+        String result = yysMaterialProcurementOrderService.shipments(request);
+        if (result.contains("成功")) {
+            return ActionResult.success(result);
+        }
+        return ActionResult.fail(result);
     }
+
     @Operation(summary = "点击延期发货-App")
-    @PostMapping("/delayGoods")
-    public ActionResult delayGoods(@RequestBody YysMaterialProcurementOrderRequest queryDelay) {
-        return ActionResult.success(yysMaterialProcurementOrderService.delayGoods(queryDelay));
+    @PostMapping("/delay")
+    public ActionResult delay(@RequestBody YysMaterialProcurementOrderRequest request) {
+        yysMaterialProcurementOrderService.delay(request);
+        return ActionResult.success();
     }
+
     @Operation(summary = "缺货结单-App")
-    @PostMapping("/noGoods")
-    public ActionResult noGoods(@RequestBody YysMaterialProcurementOrderRequest queryNo) {
-        return ActionResult.success(yysMaterialProcurementOrderService.noGoods(queryNo));
+    @PostMapping("/finish")
+    public ActionResult finish(@RequestBody YysMaterialProcurementOrderRequest request) {
+        yysMaterialProcurementOrderService.finish(request);
+        return ActionResult.success();
     }
 
+    @Operation(summary = "接单-App")
+    @GetMapping("/takeOrder/{orderNumber}")
+    public ActionResult takeOrder(@PathVariable String orderNumber) {
+        yysMaterialProcurementOrderService.takeOrder(orderNumber);
+        return ActionResult.success();
+    }
+
+    @Operation(summary = "确认到货")
+    @PostMapping("/confirmQuantity")
+    public ActionResult confirmQuantity(@RequestBody YysMaterialProcurementOrderRequest request) {
+        String result = yysMaterialProcurementOrderService.confirmQuantity(request);
+        if (result.contains("成功")) {
+            return ActionResult.success(result);
+        }
+        return ActionResult.fail(result);
+    }
 
     @Operation(summary = "采购协同列表-App")
     @PostMapping("/list")
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementOrderEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementOrderEntity.java
index 7f1e0ac..32ce56e 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementOrderEntity.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMaterialProcurementOrderEntity.java
@@ -45,6 +45,8 @@ public class YysMaterialProcurementOrderEntity  {
     private BigDecimal totalProductionQuantity;
     @TableField(value = "TOTAL_SEND_QUANTITY" , updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal totalSendQuantity;
+    @TableField(value = "PRODUCTION_DATE" , updateStrategy = FieldStrategy.IGNORED)
+    private Date productionDate;
     @TableField(value = "REQUEST_DELIVERY_DATE" , updateStrategy = FieldStrategy.IGNORED)
     private Date requestDeliveryDate;
     @TableField(value = "DELAYED_DELIVERY_DATE" , updateStrategy = FieldStrategy.IGNORED)
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/ProcurementOrderStatusEnum.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/ProcurementOrderStatusEnum.java
new file mode 100644
index 0000000..8b6bd2d
--- /dev/null
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/ProcurementOrderStatusEnum.java
@@ -0,0 +1,54 @@
+package jnpf.model.yysmaterialprocurementorder;
+
+import lombok.Getter;
+
+@Getter
+public enum ProcurementOrderStatusEnum {
+    /**
+     * 未接单
+     */
+    NO_ORDERS_TAKEN("1", "未接单"),
+
+    /**
+     * 已接单
+     */
+    ORDERS_TAKEN("2", "已接单"),
+
+    /**
+     * 缺货结单
+     */
+    OUT_OF_STOCK_STATEMENTS("3", "缺货结单"),
+
+    /**
+     * 部分发货
+     */
+    PARTIAL_SHIPMENT("4", "部分发货"),
+
+    /**
+     * 已发货
+     */
+    SHIPPED("6", "已发货"),
+
+    /**
+     * 已到货
+     */
+    ARRIVED("7", "已到货"),
+
+    /**
+     * 全部发货
+     */
+    ALL_SHIPPED("5", "全部发货"),
+
+    /**
+     * 投产(部分投产)
+     */
+    TO_PRODUCTION("8", "投产(部分投产)");
+
+    private final String code;
+    private final String msg;
+
+    ProcurementOrderStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderRequest.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderRequest.java
index 34ec11e..71c1c2f 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderRequest.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderRequest.java
@@ -1,8 +1,6 @@
 package jnpf.model.yysmaterialprocurementorder;
 
-import cn.hutool.core.date.DateTime;
 import lombok.Data;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,14 +11,36 @@ import java.util.Date;
  */
 @Data
 public class YysMaterialProcurementOrderRequest {
-    private String id;
-    private Date tcTime;
-    private BigDecimal tcNumber;
-    private DateTime sendTime;
+    /**
+     * 采购订单号
+     */
+    private String orderNumber;
+    /**
+     * 投产时间
+     */
+    private Date productionTime;
+    /**
+     * 投产数量
+     */
+    private BigDecimal productionNumber;
+    /**
+     * 本次发货时间（分批发货时间）
+     */
+    private Date sendTime;
+    /**
+     * 本次发货数量
+     */
     private BigDecimal sendNumber;
-    private Date requiredTime;
-    private Date expectedTime;
-    private String reason;
-
-
+    /**
+     * 预计交货日期（延期交货日期）
+     */
+    private Date expectedSendTime;
+    /**
+     * 延期原因
+     */
+    private String extensionReason;
+    /**
+     * 确认到货数量
+     */
+    private BigDecimal confirmQuantity;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/DialogComponent.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/DialogComponent.vue
new file mode 100644
index 0000000..e548786
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/DialogComponent.vue
@@ -0,0 +1,54 @@
+<template>
+    <el-dialog title="确认到货" :visible.sync="showDialog" width="30%" @close="handleDialogClose">
+        <el-form ref="form" :model="form" label-width="120px">
+            <el-form-item label="本次发货数量">
+                <el-input v-model="form.batchShipmentQuantity" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="确认到货数量">
+                <el-input v-model="form.confirmQuantity" placeholder="请输入确认到货数量"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="showDialog = false">取 消</el-button>
+            <el-button type="primary" @click="handleSubmit">确 认</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    props: {
+        showDialog: {
+            type: Boolean,
+            default: false,
+        },
+        selectedRows: {
+            type: Array,
+            default: () => []
+        },
+        onSubmit: {
+            type: Function,
+            default: () => { },
+        },
+    },
+    data() {
+        return {
+            form: {
+                confirmQuantity: '',
+            },
+        };
+    },
+    methods: {
+        handleDialogClose() {
+            this.form.confirmQuantity = ''; // 清空输入框内容  
+            this.$emit('update:showDialog', false); // 通知父组件更新 showDialog  
+        },
+        handleSubmit() {
+            this.onSubmit({
+                confirmQuantity: this.form.confirmQuantity,
+            });
+            this.handleDialogClose(); // 关闭弹窗  
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/form.vue
index 6a55eb2..6cee820 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/form.vue
@@ -1,219 +1,217 @@
-
-
-
-    <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
+                <div class="options">
+                    <!-- <el-dropdown class="dropdown" placement="bottom">
+                        <el-button style="width:70px">
+                            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <template v-if="dataForm.id">
+                                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                    {{ '上一条' }}
+                                </el-dropdown-item>
+                                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                    {{ '下一条' }}
+                                </el-dropdown-item>
+                            </template>
+                            <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                :loading="continueBtnLoading" :disabled='btnLoading'>
+                                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown> -->
+                    <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+                        :disabled='continueBtnLoading'> 保
+                        存</el-button>
+                    <el-button @click="goBack"> 取 消</el-button>
                 </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="采购单号"   prop="orderNumber" >
-        <JnpfInput   v-model="dataForm.orderNumber" @change="changeData('orderNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
+                    label-position="right">
+                    <template v-if="!loading">
+                        <!-- 具体表单 -->
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="采购单号" prop="orderNumber">
+                                <JnpfInput v-model="dataForm.orderNumber" @change="changeData('orderNumber', -1)"
+                                    placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="单据日期"   prop="orderDate" >
-        <JnpfDatePicker   v-model="dataForm.orderDate" @change="changeData('orderDate',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="采购计划单号"   prop="procurementNumber" >
-        <JnpfInput   v-model="dataForm.procurementNumber" @change="changeData('procurementNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="供应商"   prop="supplier" >
-        <JnpfInput   v-model="dataForm.supplier" @change="changeData('supplier',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="物料编码"   prop="materialCode" >
-        <JnpfInput   v-model="dataForm.materialCode" @change="changeData('materialCode',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="物料名称"   prop="materialName" >
-        <JnpfInput   v-model="dataForm.materialName" @change="changeData('materialName',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="规格型号"   prop="specification" >
-        <JnpfInput   v-model="dataForm.specification" @change="changeData('specification',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="下单数量"   prop="orderQuantity" >
-        <JnpfInputNumber   v-model="dataForm.orderQuantity" @change="changeData('orderQuantity',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="计量单位"   prop="unit" >
-        <JnpfInput   v-model="dataForm.unit" @change="changeData('unit',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="总投产数量"   prop="totalProductionQuantity" >
-        <JnpfInputNumber   v-model="dataForm.totalProductionQuantity" @change="changeData('totalProductionQuantity',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="总发货数量"   prop="totalSendQuantity" >
-        <JnpfInputNumber   v-model="dataForm.totalSendQuantity" @change="changeData('totalSendQuantity',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="单据日期" prop="orderDate">
+                                <JnpfDatePicker v-model="dataForm.orderDate" @change="changeData('orderDate', -1)"
+                                    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                                    placeholder="请选择" disabled clearable :style='{ "width": "100%" }' type="date"
+                                    format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
+                                <JnpfInput v-model="dataForm.procurementNumber"
+                                    @change="changeData('procurementNumber', -1)" placeholder="请输入" disabled clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="供应商" prop="supplier">
+                                <JnpfInput v-model="dataForm.supplier" @change="changeData('supplier', -1)"
+                                    placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="物料编码" prop="materialCode">
+                                <JnpfInput v-model="dataForm.materialCode" @change="changeData('materialCode', -1)"
+                                    placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="物料名称" prop="materialName">
+                                <JnpfInput v-model="dataForm.materialName" @change="changeData('materialName', -1)"
+                                    placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="规格型号" prop="specification">
+                                <JnpfInput v-model="dataForm.specification" @change="changeData('specification', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="下单数量" prop="orderQuantity">
+                                <JnpfInputNumber v-model="dataForm.orderQuantity"
+                                    @change="changeData('orderQuantity', -1)" placeholder="数字文本" :precision="2"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="计量单位" prop="unit">
+                                <JnpfInput v-model="dataForm.unit" @change="changeData('unit', -1)" placeholder="请输入"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="总投产数量" prop="totalProductionQuantity">
+                                <JnpfInputNumber v-model="dataForm.totalProductionQuantity"
+                                    @change="changeData('totalProductionQuantity', -1)" placeholder="数字文本" :precision="2"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="总发货数量" prop="totalSendQuantity">
+                                <JnpfInputNumber v-model="dataForm.totalSendQuantity"
+                                    @change="changeData('totalSendQuantity', -1)" placeholder="数字文本" :precision="2"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="要求到货日期"   prop="requestDeliveryDate" >
-        <JnpfDatePicker   v-model="dataForm.requestDeliveryDate" @change="changeData('requestDeliveryDate',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="延期原因"   prop="delayReason" >
-        <JnpfInput   v-model="dataForm.delayReason" @change="changeData('delayReason',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="要求到货日期" prop="requestDeliveryDate">
+                                <JnpfDatePicker v-model="dataForm.requestDeliveryDate"
+                                    @change="changeData('requestDeliveryDate', -1)"
+                                    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
+                                    format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="延期原因" prop="delayReason">
+                                <JnpfInput v-model="dataForm.delayReason" @change="changeData('delayReason', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="延期交货日期"   prop="delayedDeliveryDate" >
-        <JnpfDatePicker   v-model="dataForm.delayedDeliveryDate" @change="changeData('delayedDeliveryDate',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="延期交货日期" prop="delayedDeliveryDate">
+                                <JnpfDatePicker v-model="dataForm.delayedDeliveryDate"
+                                    @change="changeData('delayedDeliveryDate', -1)"
+                                    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
+                                    format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="分批发货日期"   prop="batchDeliveryDate" >
-        <JnpfDatePicker   v-model="dataForm.batchDeliveryDate" @change="changeData('batchDeliveryDate',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="分批发货数量"   prop="batchShipmentQuantity" >
-        <JnpfInputNumber   v-model="dataForm.batchShipmentQuantity" @change="changeData('batchShipmentQuantity',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="确认到货数量"   prop="confirmQuantityReceived" >
-        <JnpfInputNumber   v-model="dataForm.confirmQuantityReceived" @change="changeData('confirmQuantityReceived',-1)" 
- placeholder="数字文本"  :precision="2"  :step="1" >
-    </JnpfInputNumber>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8" >
-        <jnpf-form-tip-item
- label="单据状态"   prop="orderStatus" >
-        <JnpfSelect   v-model="dataForm.orderStatus" @change="changeData('orderStatus',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="orderStatusOptions" :props="orderStatusProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="订单附件"   prop="orderFiles" >
-        <JnpfUploadFile   v-model="dataForm.orderFiles" @change="changeData('orderFiles',-1)" 
- :fileSize="10" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  buttonText="点击上传" >
-    </JnpfUploadFile>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
-    </div>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="分批发货日期" prop="batchDeliveryDate">
+                                <JnpfDatePicker v-model="dataForm.batchDeliveryDate"
+                                    @change="changeData('batchDeliveryDate', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                    :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
+                                    :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="分批发货数量" prop="batchShipmentQuantity">
+                                <JnpfInputNumber v-model="dataForm.batchShipmentQuantity"
+                                    @change="changeData('batchShipmentQuantity', -1)" placeholder="数字文本" :precision="2"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="确认到货数量" prop="confirmQuantityReceived">
+                                <JnpfInputNumber v-model="dataForm.confirmQuantityReceived"
+                                    @change="changeData('confirmQuantityReceived', -1)" placeholder="数字文本" :precision="2"
+                                    :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="单据状态" prop="orderStatus">
+                                <JnpfSelect v-model="dataForm.orderStatus" @change="changeData('orderStatus', -1)"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' :options="orderStatusOptions"
+                                    :props="orderStatusProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="订单附件" prop="orderFiles">
+                                <JnpfUploadFile v-model="dataForm.orderFiles" @change="changeData('orderFiles', -1)"
+                                    :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0"
+                                    buttonText="点击上传">
+                                </JnpfUploadFile>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </div>
     </transition>
-    </template>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: {},
+    props: [],
+    data() {
         return {
             dataFormSubmitType: 0,
             continueBtnLoading: false,
@@ -225,379 +223,379 @@
             loading: false,
             btnLoading: false,
             formRef: 'formRef',
-            setting:{},
+            setting: {},
             eventType: '',
-            userBoxVisible:false,
+            userBoxVisible: false,
             selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
             },
             //可选范围默认值
-            ableAll:{
+            ableAll: {
             },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
             dataForm: {
-                                orderNumber : undefined,
-                                orderDate : undefined,
-                                procurementNumber : undefined,
-                                supplier : undefined,
-                                materialCode : undefined,
-                                materialName : undefined,
-                                specification : undefined,
-                                orderQuantity : undefined,
-                                unit : undefined,
-                                totalProductionQuantity : undefined,
-                                totalSendQuantity : undefined,
-                                requestDeliveryDate : undefined,
-                                delayReason : undefined,
-                                delayedDeliveryDate : undefined,
-                                batchDeliveryDate : undefined,
-                                batchShipmentQuantity : undefined,
-                                confirmQuantityReceived : undefined,
-                                    orderStatus : undefined,
-                                    orderFiles : [],
+                orderNumber: undefined,
+                orderDate: undefined,
+                procurementNumber: undefined,
+                supplier: undefined,
+                materialCode: undefined,
+                materialName: undefined,
+                specification: undefined,
+                orderQuantity: undefined,
+                unit: undefined,
+                totalProductionQuantity: undefined,
+                totalSendQuantity: undefined,
+                requestDeliveryDate: undefined,
+                delayReason: undefined,
+                delayedDeliveryDate: undefined,
+                batchDeliveryDate: undefined,
+                batchShipmentQuantity: undefined,
+                confirmQuantityReceived: undefined,
+                orderStatus: undefined,
+                orderFiles: [],
             },
             tableRequiredData: {},
             dataRule:
             {
-                            supplier: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            orderQuantity: [
-                                {
-                                    required: true,
-                                    message: '数字文本',
-                                    trigger: ["blur","change"]
-                                },
-                        ],
+                supplier: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                orderQuantity: [
+                    {
+                        required: true,
+                        message: '数字文本',
+                        trigger: ["blur", "change"]
+                    },
+                ],
             },
-                            orderStatusOptions:[{"fullName":"未接单","id":"1"},{"fullName":"已接单","id":"2"},{"fullName":"缺货结单","id":"3"},{"fullName":"部分发货","id":"4"},{"fullName":"全部发货","id":"5"},{"fullName":"已发货","id":"6"},{"fullName":"已到货","id":"7"}],
-                            orderStatusProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        orderNumber:[] ,
-                        orderDate:[] ,
-                        procurementNumber:[] ,
-                        supplier:[] ,
-                        materialCode:[] ,
-                        materialName:[] ,
-                        specification:[] ,
-                        orderQuantity:[] ,
-                        unit:[] ,
-                        totalProductionQuantity:[] ,
-                        totalSendQuantity:[] ,
-                        requestDeliveryDate:[] ,
-                        delayReason:[] ,
-                        delayedDeliveryDate:[] ,
-                        batchDeliveryDate:[] ,
-                        batchShipmentQuantity:[] ,
-                        confirmQuantityReceived:[] ,
-                        orderStatus:[] ,
-                        orderFiles:[] ,
+            orderStatusOptions: [{ "fullName": "未接单", "id": "1" }, { "fullName": "已接单", "id": "2" }, { "fullName": "缺货结单", "id": "3" }, { "fullName": "部分发货", "id": "4" }, { "fullName": "全部发货", "id": "5" }, { "fullName": "已发货", "id": "6" }, { "fullName": "已到货", "id": "7" }],
+            orderStatusProps: { "label": "fullName", "value": "id" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                orderNumber: [],
+                orderDate: [],
+                procurementNumber: [],
+                supplier: [],
+                materialCode: [],
+                materialName: [],
+                specification: [],
+                orderQuantity: [],
+                unit: [],
+                totalProductionQuantity: [],
+                totalSendQuantity: [],
+                requestDeliveryDate: [],
+                delayReason: [],
+                delayedDeliveryDate: [],
+                batchDeliveryDate: [],
+                batchShipmentQuantity: [],
+                confirmQuantityReceived: [],
+                orderStatus: [],
+                orderFiles: [],
             },
         }
+    },
+    computed: {
+        ...mapGetters(['userInfo'])
+    },
+    watch: {},
+    created() {
+        this.dataAll()
+        this.initDefaultData()
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        prev() {
+            this.index--
+            if (this.index === 0) {
+                this.prevDis = true
+            }
+            this.nextDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
         },
-        computed: {
-            ...mapGetters(['userInfo'])
+        next() {
+            this.index++
+            if (this.index === this.allList.length - 1) {
+                this.nextDis = true
+            }
+            this.prevDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
         },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        getInfo(id) {
+            request({
+                url: '/api/example/YysMaterialProcurementOrder/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
         },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/example/YysMaterialProcurementOrder/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
+        goBack() {
+            this.visible = false
+            this.$emit('refreshDataList', true)
+        },
+        changeData(model, index) {
+            this.isEdit = false
+            this.childIndex = index
+            let modelAll = model.split("-");
+            let faceMode = "";
+            for (let i = 0; i < modelAll.length; i++) {
+                faceMode += modelAll[i];
+            }
+            for (let key in this.interfaceRes) {
+                if (key != faceMode) {
+                    let faceReList = this.interfaceRes[key]
+                    for (let i = 0; i < faceReList.length; i++) {
+                        if (faceReList[i].relationField == model) {
+                            let options = 'get' + key + 'Options';
+                            if (this[options]) {
+                                this[options]()
                             }
+                            this.changeData(key, index)
                         }
                     }
                 }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
+            }
+        },
+        changeDataFormData(type, data, model, index, defaultValue) {
+            if (!this.isEdit) {
+                if (type == 2) {
+                    for (let i = 0; i < this.dataForm[data].length; i++) {
+                        if (index == -1) {
+                            this.dataForm[data][i][model] = defaultValue
+                        } else if (index == i) {
+                            this.dataForm[data][i][model] = defaultValue
                         }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-            },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
                     }
                 } else {
+                    this.dataForm[data] = defaultValue
+                }
+            }
+        },
+        dataAll() {
+        },
+        goBack() {
+            this.$emit('refresh')
+        },
+        clearData() {
+            this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+        },
+        init(id, isDetail, allList) {
+            this.prevDis = false
+            this.nextDis = false
+            this.allList = allList || []
+            if (allList.length) {
+                this.index = this.allList.findIndex(item => item.id === id)
+                if (this.index == 0) {
                     this.prevDis = true
+                }
+                if (this.index == this.allList.length - 1) {
                     this.nextDis = true
                 }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/YysMaterialProcurementOrder/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
-
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
+            } else {
+                this.prevDis = true
+                this.nextDis = true
+            }
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/example/YysMaterialProcurementOrder/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
                 } else {
-                    this.btnLoading = true
+                    this.clearData()
+                    this.initDefaultData()
                 }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/example/YysMaterialProcurementOrder',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+        },
+        //初始化默认数据
+        initDefaultData() {
+
+        },
+        // 表单提交
+        dataFormSubmit(type) {
+            this.dataFormSubmitType = type ? type : 0
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    this.request()
+                }
+            })
+        },
+        request() {
+            let _data = this.dataList()
+            if (this.dataFormSubmitType == 2) {
+                this.continueBtnLoading = true
+            } else {
+                this.btnLoading = true
+            }
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/example/YysMaterialProcurementOrder',
+                    method: 'post',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) {
+                                this.$nextTick(() => {
+                                    this.clearData()
+                                    this.initDefaultData()
+                                })
+                                this.continueBtnLoading = false
+                                return
                             }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }else{
-                    request({
-                        url: '/api/example/YysMaterialProcurementOrder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/example/YysMaterialProcurementOrder/' + this.dataForm.id,
+                    method: 'PUT',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
+            }
+        },
+        openSelectDialog(key) {
+            this.currTableConf = this.addTableConf[key]
+            this.currVmodel = key
+            this.selectDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.selectDialog.init()
+            })
+        },
+        addForSelect(data) {
+            for (let i = 0; i < data.length; i++) {
+                let t = data[i]
+                if (this['get' + this.currVmodel]) {
+                    this['get' + this.currVmodel](t)
                 }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
+            }
+        },
+        dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+            let timeDataValue = null;
+            let timeValue = Number(timeValueData)
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = new Date().getTime()
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getBeforeData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                    }
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getLaterData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
                     }
                 }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
+            }
+            return timeDataValue;
+        },
+        time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+            let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+            let timeDataValue = null
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue || '00:00:00'
+                    if (timeDataValue.split(':').length == 3) {
+                        timeDataValue = timeDataValue
+                    } else {
+                        timeDataValue = timeDataValue + ':00'
                     }
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = this.jnpf.toDate(new Date(), format)
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    previousDate = getBeforeTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    previousDate = getLaterTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
                 }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
+            }
+            return timeDataValue;
+        },
+        dataList() {
+            var _data = this.dataForm;
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+            this.isEdit = true
+            this.dataAll()
+            this.childIndex = -1
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/index.vue
index edb9221..c557c4b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/index.vue
@@ -136,6 +136,8 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
+              <el-button type="text" v-show="scope.row.orderStatus == '已发货'" @click="showDialog = true" v-has="'btn_edit'">确认到货
+              </el-button>
               <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
@@ -154,6 +156,7 @@
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
     <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <DialogComponent :showDialog.sync="showDialog" @update:showDialog="showDialog = $event" :onSubmit="handleSubmit" />
   </div>
 </template>
 
@@ -173,9 +176,10 @@ import columnList from "./columnList";
 import { thousandsFormat } from "@/components/Generator/utils/index";
 import SuperQuery from "@/components/SuperQuery";
 import superQueryJson from "./superQueryJson";
-
+import DialogComponent from "@/views/yys/yysmaterialprocurementorder/DialogComponent.vue";
 export default {
   components: {
+    DialogComponent,
     JNPFForm,
     Detail,
     ExportBox,
@@ -193,7 +197,7 @@ export default {
       mergeList: [],
       exportList: [],
       columnList,
-
+      showDialog: false,
       showAll: false,
       superQueryVisible: false,
       superQueryJson,
@@ -252,6 +256,13 @@ export default {
     this.queryData = JSON.parse(JSON.stringify(this.query));
   },
   methods: {
+    confirmQuantity(row, isDetail) {
+      let id = row ? row.id : "";
+      this.auditVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Audit.init(id, isDetail, this.list);
+      });
+    },
     toDetail(defaultValue, modelId) {
       if (!defaultValue) return;
       getConfigData(modelId).then(res => {
@@ -528,7 +539,31 @@ export default {
     colseFlow(isrRefresh) {
       this.flowVisible = false;
       if (isrRefresh) this.reset();
-    }
+    },
+    handleSubmit(rows) {
+      console.log(rows,"selectedRowsselectedRows");
+      
+            if (rows.confirmQuantity == null || rows.confirmQuantity == '') {
+                this.$message.error('请填写确认到货数量！');
+                return;
+            }
+            let _query = {
+              orderNumber: this.da,
+              confirmQuantity: rows.confirmQuantity,
+            };
+            request({
+                url: `/api/example/YysMaterialProcurementOrder/confirmQuantity`,
+                method: 'post',
+                data: _query
+            }).then(res => {
+                this.$message({
+                    message: res.msg,
+                    type: 'success',
+                    duration: 1000,
+                })
+                this.initData()
+            })
+        },
   }
 };
 </script>