From 217a7ee237ef414df9486c6bf2a00070330b9adc Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 11 Mar 2024 22:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=9B=9E=E4=B8=80=E5=B0=8F=E6=97=B6=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=EF=BC=9B=E6=88=90=E5=93=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91/=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/job/task/RyTask.java |   2 +-
 .../op/mes/domain/MesReportWorkConsume.java   |   9 +
 .../mapper/mes/MesReportWorkConsumeMapper.xml |   6 +-
 .../mapper/mes/MesReportWorkMapper.xml        |  30 +--
 .../java/com/op/open/mapper/OpenMapper.java   |   2 +-
 .../op/open/service/impl/OpenServiceImpl.java |  12 +-
 .../ProOrderWorkorderController.java          |  14 ++
 .../mapper/ProOrderWorkorderBatchMapper.java  |   1 +
 .../service/IProOrderWorkorderService.java    |   2 +
 .../impl/ProOrderWorkorderServiceImpl.java    | 208 ++++++++++++++++--
 .../resources/mapper/plan/ProOrderMapper.xml  |   2 +-
 .../plan/ProOrderWorkorderBatchMapper.xml     |   9 +
 .../impl/QcCheckTaskProduceServiceImpl.java   |  10 +-
 13 files changed, 266 insertions(+), 41 deletions(-)

diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
index 2868bf0e..e8169b8f 100644
--- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
+++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
@@ -155,7 +155,7 @@ public class RyTask {
 	}
 
 	/************质量管理系统定时任务开始*****************/
-	//过程巡检，改为整点08：00-20：00运行
+	//过程巡检，每3分钟执行检查一次
 	public void createProduceXJTask(){
 		logger.info("++质量管理系统+过程巡检+开始++createProduceXJTask+++++");
 		remoteQualityService.createProduceXJTask();
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
index 5f2a6583..1f85da30 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java
@@ -107,6 +107,15 @@ public class MesReportWorkConsume extends BaseEntity {
     private String productGroupName;
     //上级物料
     private String pMaterialCode;
+    private String workorderCodeSap;
+
+    public String getWorkorderCodeSap() {
+        return workorderCodeSap;
+    }
+
+    public void setWorkorderCodeSap(String workorderCodeSap) {
+        this.workorderCodeSap = workorderCodeSap;
+    }
 
     public String getpMaterialCode() {
         return pMaterialCode;
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index 42429401..a33283fa 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -102,9 +102,11 @@
 			mrwc.quantity,
 			mrwc.unit,
 			mrwc.create_time createTime,
-		    mrwc.recoil
+		    mrwc.recoil,
+            pow.workorder_code_sap workorderCodeSap
 		from mes_report_work_consume mrwc
-		where mrwc.del_flag = '0'
+        left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code
+		where mrwc.del_flag = '0' and pow.del_flag = '0'
 			and mrwc.workorder_code = #{workorderCode}
         order by mrwc.recoil
 	</select>
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index a4a21585..33b8d260 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -529,24 +529,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getReportList" resultType="com.op.mes.domain.MesReportWork">
 		select
-		    id,
-			workorder_code workorderCode,
-			report_code reportCode,
-			batch,
-			quantity_feedback quantityFeedback,
-		    unit,
-			work_time workTime,
-			use_man useMan,
-		    create_time createTime
-		from mes_report_work
-		where  del_flag='0'
+		    mrw.id,
+			mrw.workorder_code workorderCode,
+			mrw.report_code reportCode,
+			mrw.batch,
+			mrw.quantity_feedback quantityFeedback,
+			mrw.unit,
+			mrw.work_time workTime,
+			mrw.use_man useMan,
+			mrw.create_time createTime,
+			pow.workorder_code_sap workorderCodeSap
+		from mes_report_work mrw
+		left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
+		where mrw.del_flag='0' and pow.del_flag = '0'
 			<if test='parentOrder=="0"'>
-				and workorder_code = #{workorderCode}
+				and mrw.workorder_code = #{workorderCode}
 			</if>
 			<if test='parentOrder!="0"'>
-				and parent_order = #{workorderCode}
+				and mrw.parent_order = #{workorderCode}
 			</if>
-            order by end_report
+            order by mrw.end_report
 	</select>
 	<select id="getPrepareList" resultType="com.op.mes.domain.MesPrepareDetail">
 		select
diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
index 769e2d6a..53974893 100644
--- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
+++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
@@ -73,7 +73,7 @@ public interface OpenMapper {
 
     List<QcCheckTaskDetailDTO> getTPByTypeGroup(QcCheckTypeProjectDTO qctp);
 
-    void insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce);
+    int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce);
 
     public int addBatch(@Param("list") List<QcCheckTaskDetailDTO> items);
 
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 146764e9..3e51c933 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -370,7 +370,7 @@ public class OpenServiceImpl implements OpenService {
         }
         /**qc_check_task_user**/
         int m = openMapper.addCheckUsers(users);
-        logger.info("检查人新增" + m + "成功");
+        logger.info(qcCheckTaskProduce.getOrderNo()+":检查人新增" + m + "成功");
 
         /**qc_check_type_project**/
         List<QcCheckTaskDetailDTO> items = openMapper.getTPByTypeMaterial(qctp);
@@ -378,7 +378,7 @@ public class OpenServiceImpl implements OpenService {
             /**qc_material_group_detail**/
             QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
             if (group == null) {
-                logger.info(qcCheckTaskProduce.getMaterialCode()+"没有维护物料组检测项，检验任务生成失败");
+                logger.info(qcCheckTaskProduce.getOrderNo()+":"+qcCheckTaskProduce.getMaterialCode()+"没有维护物料组检测项，检验任务生成失败");
                 return 0;//没有找到检测项目
             }
             qctp.setGroupId(group.getGroupId());//共性
@@ -400,7 +400,9 @@ public class OpenServiceImpl implements OpenService {
         qcCheckTaskProduce.setSupplierName(qcCheckTaskProduce.getCarName());
         qcCheckTaskProduce.setCheckManName(null);
         qcCheckTaskProduce.setCheckManCode(null);
-        openMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
+        int m0 = openMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
+        logger.info(qcCheckTaskProduce.getOrderNo()+":qc_check_task新增" + m0 + "成功");
+
         /**qc_check_task_detail**/
         for (QcCheckTaskDetailDTO item : items) {
             item.setRecordId(IdUtils.fastSimpleUUID());
@@ -410,7 +412,9 @@ public class OpenServiceImpl implements OpenService {
             item.setFactoryCode(factoryCode);
             item.setStatus("Y");
         }
-        return openMapper.addBatch(items);
+        int n = openMapper.addBatch(items);
+        logger.info(qcCheckTaskProduce.getOrderNo()+":qc_check_task_detail新增" + n + "成功");
+        return n;
     }
 
     @Override
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java
index c78544be..46048642 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java
@@ -77,6 +77,19 @@ public class ProOrderWorkorderController extends BaseController {
         return proOrderWorkorderService.subChangeWorkOrder(splitOrderDTO);
     }
 
+    /**
+     * 提交修改工单接口
+     *
+     * @param splitOrderDTO
+     * @return
+     */
+    @PostMapping("/subChangeWorkOrderPro")
+    @RequiresPermissions("mes:pro:workorder:edit")
+    @Log(title = "修改成品工单", businessType = BusinessType.UPDATE)
+    public AjaxResult subChangeWorkOrderPro(@RequestBody SplitOrderDTO splitOrderDTO) {
+        return proOrderWorkorderService.subChangeWorkOrderPro(splitOrderDTO);
+    }
+
     /**
      * 提交修改工单-设备变更接口
      *
@@ -234,6 +247,7 @@ public class ProOrderWorkorderController extends BaseController {
         return toAjax(1);
     }
 
+
     /**
      * 下发生产工单。workorderIds：母工单号
      */
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderBatchMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderBatchMapper.java
index 291e58e4..e2632c18 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderBatchMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderBatchMapper.java
@@ -78,4 +78,5 @@ public interface ProOrderWorkorderBatchMapper {
      */
     List<String> selectCodeByWorkOrderIds(String[] workorderIds);
 
+    public int deleteBatch(String[] workorderIds);
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
index 16732bd5..92d77931 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
@@ -129,4 +129,6 @@ public interface IProOrderWorkorderService {
     List<ProOrderWorkorder> getWorkorderLevel0List(ProOrderWorkorder proOrderWorkorder);
 
     List<ProOrderWorkorder> getNextLevelWorkOrderList(ProOrderWorkorder proOrderWorkorder);
+
+    AjaxResult subChangeWorkOrderPro(SplitOrderDTO splitOrderDTO);
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index a4507697..91b58af0 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -248,16 +248,16 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             ProOrderWorkorder work = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(workorderId);
             if (work != null) {
                 workers.add(work);
-                ProOrderWorkorder bottomWork = work;
+                ProOrderWorkorder topWork = work;
                 Boolean run = true;
                 while (run) {
-                    //上级
-                    ProOrderWorkorder topworkers = proOrderWorkorderMapper.selectWorkOrderByCode(bottomWork.getParentOrder());
+                    //下级
+                    ProOrderWorkorder sonWorkers = proOrderWorkorderMapper.selectSonWorkOrder(topWork.getWorkorderCode());
                     //有上级code
-                    if (topworkers != null) {
-                        workers.add(topworkers);
-                        delteIds.add(topworkers.getWorkorderId());
-                        bottomWork.setParentOrder(topworkers.getParentOrder());
+                    if (sonWorkers != null) {
+                        workers.add(sonWorkers);
+                        delteIds.add(sonWorkers.getWorkorderId());
+                        topWork.setWorkorderCode(sonWorkers.getWorkorderCode());
                     } else {
                         run = false;
                     }
@@ -268,7 +268,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 //删除工单(字母)pro_order_workorder
                 proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds0);
                 //删除批次pro_order_workorder_batch
-                proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(workorderIds0);
+                proOrderWorkorderBatchMapper.deleteBatch(workorderIds0);
             }
 
             if (!CollectionUtils.isEmpty(workers)) {
@@ -831,7 +831,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                                 "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg());
                     }
 
-                    // 获得对应工单
+                    // 获得对应工单----------------------------------------------------------------------------？
                     ProOrderWorkorder proOrderWorkorder = workOrderList.get(--index);
                     // 更新订单
                     proOrder.setUpdateBy(SecurityContextHolder.getUserName());
@@ -882,9 +882,6 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                         // 更新至数据库
                         proOrderWorkorderBatchMapper.insertProOrderWorkorderBatch(workBatch);
 
-                        // 测试
-//                    System.out.println("这里是workorderId----------->"+workBatch.getWorkorderId());
-//                    System.out.println("这里是拆分数量----------->"+workBatch.getBatchQuantity());
                     }
 
                     // 如果存在子节点
@@ -900,7 +897,6 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                     }
                 }
                 return success("变更成功");
-//                throw new RuntimeException();
             }
 
 
@@ -910,6 +906,192 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         return error(500, "批次号不能重复");
     }
 
+    /**
+     * 提交修改工单接口
+     *
+     * @param splitOrderDTO
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    @Transactional
+    public AjaxResult subChangeWorkOrderPro(SplitOrderDTO splitOrderDTO) {
+
+        // 获得子工单对象——(这里没有用BeanUtils是因为若依与这个冲突造成死循环得到错误的结果)
+        ProOrderWorkorder proWorkOrder = splitOrderDTO.getProOrderWorkorder();
+        // 通过子工单获得所有工单信息,并将所有工单信息放入list中
+        List<ProOrderWorkorder> workOrderList = new ArrayList<>();
+        // 将获得的工单的id存放
+        List<String> ids = new ArrayList<>();
+        boolean getworkOrder = true;
+        // 将工单放入list
+        workOrderList.add(proWorkOrder);
+        // 将id放入
+        ids.add(proWorkOrder.getWorkorderId());
+
+        // 用于循环
+        ProOrderWorkorder childWorkOrder = new ProOrderWorkorder();
+        BeanUtils.copyProperties(proWorkOrder, childWorkOrder);
+
+        while (getworkOrder) {
+            // 通过parentOrder查询子工单信息
+            ProOrderWorkorder sonWorkOrder = proOrderWorkorderMapper.selectSonWorkOrder(childWorkOrder.getWorkorderCode());
+            if (sonWorkOrder != null) {
+                // 将重置对象
+                BeanUtils.copyProperties(sonWorkOrder, childWorkOrder);
+                // 将工单放入list
+                workOrderList.add(sonWorkOrder);
+                // 将id放入
+                ids.add(sonWorkOrder.getWorkorderId());
+            } else {
+                // 终止循环
+                getworkOrder = false;
+            }
+        }
+
+        boolean checkout = true;
+
+        // 校验批次编号是否存在（重复问题）
+        String[] workorderIds = (String[]) ids.toArray(new String[ids.size()]);
+        List<String> batchCodes = proOrderWorkorderBatchMapper.selectCodeByWorkOrderIds(workorderIds);
+        for (int i = 0; i < batchCodes.size(); i++) {
+            for (int j = 0; j < splitOrderDTO.getFormFields().size(); j++) {
+                if (batchCodes.get(i).equals(splitOrderDTO.getFormFields().get(j).getBatchCode())) {
+                    checkout = false;
+                }
+            }
+        }
+        //校验各工序设备是否已选择
+        List<CascaderDTO> processes = proOrderMapper.getRouteProcess(splitOrderDTO.getRouteCode());
+        if (splitOrderDTO.getProdLineCodeArray().length == 0) {
+            checkout = false;
+            return error(500, "必须选择工单生产设备!");
+        } else {
+            String codeArray = JSONArray.toJSONString(splitOrderDTO.getProdLineCodeArray());
+            for (int i = 0; i < processes.size(); i++) {
+                if (codeArray.indexOf(processes.get(i).getValue()) < 0) {
+                    checkout = false;
+                    return error(500, "所有有工序节点都必须选择生产设备!");
+                }
+            }
+
+            String[][] array = splitOrderDTO.getProdLineCodeArray();
+            for (int m = 0; m < array.length; m++) {
+                if (array[m].length < 2) {
+                    checkout = false;
+                    return error(500, "工序没有生产设备可选择，请维护工艺!");
+                }
+            }
+
+            splitOrderDTO.setProdLineCode(codeArray);
+        }
+
+        if (checkout) {
+            // 删除所有工单s下的批次信息
+            int i = proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(workorderIds);
+            // 删除湿料计划
+            proWetMaterialPlanDetailMapper.deleteProWetMaterialPlanDetailByWorkId(proWorkOrder.getWorkorderId());
+            // 创建订单信息，并将信息copy进去
+            ProOrder proOrder = new ProOrder();
+            BeanUtils.copyProperties(splitOrderDTO.getProduct(), proOrder);
+            // 设置换算基数，用于获得换算值
+            Long quantity = proOrder.getQuantity();
+            // 创建批次表通用对象
+            ProOrderWorkorderBatch workBatch = setCommonBatchAttribute();
+            boolean run = true;
+            // 获取单位换算值
+            Long conver = 1L;
+            int index = 0;
+            while (run) {
+
+                if (StringUtils.isBlank(proOrder.getParentOrder())) {
+                    //推送sap订单更新信息
+                    SapShopOrderQuery sapChange = new SapShopOrderQuery();
+                    sapChange.setAufnr(proOrder.getOrderCode());//母订单号
+                    BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
+                            .subtract(new BigDecimal(proOrder.getAtrr1()));
+                    sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
+                    logger.info("母订单" + proOrder.getOrderCode() +
+                            "订单数量变更：修改前" + proOrder.getQuantity() + "," +
+                            "已拆数量" + proOrder.getAtrr1() + "," +
+                            "给sap汇报数量" + newSapQuantityNum.toString());
+                    R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据
+                    logger.info("母订单" + proOrder.getOrderCode() +
+                            "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg());
+                }
+
+                // 获得对应工单----------------------------------------------------------------------------？
+                ProOrderWorkorder proOrderWorkorder = workOrderList.get(index++);
+                // 更新订单
+                proOrder.setUpdateBy(SecurityContextHolder.getUserName());
+                proOrder.setUpdateTime(DateUtils.getNowDate());
+                proOrder.setQuantitySplit(proOrder.getQuantitySplit() + Long.valueOf(proOrder.getAtrr1()));
+                if (proOrder.getQuantity().longValue() == proOrder.getQuantitySplit().longValue()) {
+                    // 已拆分
+                    proOrder.setStatus("o2");
+                } else {
+                    // 拆分中
+                    proOrder.setStatus("o1");
+                }
+                proOrderMapper.updateProOrder(proOrder);
+                // 设置工单信息
+                proOrderWorkorder.setUpdateBy(SecurityContextHolder.getUserName());
+                proOrderWorkorder.setUpdateTime(DateUtils.getNowDate());
+                // 拆分数量
+                proOrderWorkorder.setQuantitySplit(Long.valueOf(proOrder.getAtrr1()));
+                // 2.将工单信息更新至数据库
+                if (splitOrderDTO.getProdLineCode() != null) {
+                    proOrderWorkorder.setProdLineCode(splitOrderDTO.getProdLineCode());
+                }
+                if (splitOrderDTO.getProductDate() != null) {
+                    proOrderWorkorder.setProductDate(splitOrderDTO.getProductDate());
+                }
+                if (splitOrderDTO.getShiftId() != null) {
+                    proOrderWorkorder.setShiftId(splitOrderDTO.getShiftId());
+                }
+                if (splitOrderDTO.getRouteCode() != null) {
+                    proOrderWorkorder.setRouteCode(splitOrderDTO.getRouteCode());
+                }
+
+                proOrderWorkorderMapper.updateProOrderWorkorder(proOrderWorkorder);
+                // 删除工单下对应批次信息
+                proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderId(proOrderWorkorder.getWorkorderId());
+
+                // 生成对应批次表
+                workBatch.setWorkorderId(proOrderWorkorder.getWorkorderId());
+
+                // 生成批次表信息并更新至数据库
+                for (Batch batch : splitOrderDTO.getFormFields()) {
+                    // 生成批次id
+                    workBatch.setBatchId(IdUtils.fastSimpleUUID());
+                    // 生成批次号
+                    workBatch.setBatchCode(batch.getBatchCode());
+                    // 生成批次数量
+                    workBatch.setBatchQuantity(batch.getBatchQuantity() * conver);
+                    // 更新至数据库
+                    proOrderWorkorderBatchMapper.insertProOrderWorkorderBatch(workBatch);
+
+                }
+
+                // 如果存在子节点
+                if (proOrder.getChildren().size() > 0) {
+                    ProOrderDTO newProOrder = (ProOrderDTO) proOrder.getChildren().get(0);
+                    // 更新换算值
+                    conver = (newProOrder.getQuantity() / quantity);
+                    // 将child信息重新赋值给proOrder
+                    BeanUtils.copyProperties(newProOrder, proOrder);
+                } else {
+                    // 结束循环
+                    run = false;
+                }
+            }
+            return success("变更成功");
+        }
+
+
+        return error(500, "批次号不能重复");
+    }
+
     /**
      * 校验工单是否可以修改
      * 如果工单已生成湿料计划则不允许修改
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
index ca2fdd69..4e810034 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
@@ -296,7 +296,7 @@
             <if test="prodType != null">prod_type = #{prodType},</if>
             <if test="prodSpc != null">prod_spc = #{prodSpc},</if>
             from_sap_time = GETDATE(),
-            cegci = #{cegci},
+            <if test="cegci != null">cegci = #{cegci},</if>
             <if test="syncUser != null">sync_user = #{syncUser},</if>
         </trim>
         where id = #{id}
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
index 0402fe4d..6b01fb32 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
@@ -150,4 +150,13 @@
         )
     </delete>
 
+    <delete id="deleteBatch" parameterType="String">
+        update pro_order_workorder_batch
+        set del_flag = '1'
+        where workorder_id in
+        <foreach item="workorderId" collection="array" open="(" separator="," close=")">
+            #{workorderId}
+        </foreach>
+    </delete>
+
 </mapper>
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
index dbc19808..cb363579 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
@@ -383,14 +383,14 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 		for(QcCheckTaskProduce productTask:works){
 			productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检
 			productTask.setOrderNo(productTask.getWorkorderCode());
-//            Date nowTime = DateUtils.getNowDate();
-//            Date startTime = productTask.getCreateTime();
+            Date nowTime = DateUtils.getNowDate();
+            Date startTime = productTask.getCreateTime();
 
-//			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
-//			if(mins>=60){
+			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
+			if(mins>=60){
 				int m = insertQcCheckTaskProduce(productTask);
 				logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
-//			}
+			}
 		}
 		logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++");
 	}