报工公式修改+订单关闭接口修改+巡检多出一条的bug修复

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -295,14 +295,14 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
      *      * 其它 = 人工
      *      * 二层----------------------------------------
      *      * 子单进行报工的时候公式调整如下（数值单位不用管）：
-     *      * 机器=sum(工时数/用人数)
+     *      * 机器=sum(工时数)
      *      * 人工 = 用人数*机器
      *      * 折旧 = 机器
      *      * 其它 = 人工
      *      * <p>
      *      * 母单进行报工的时候公式调整如下：
-     *      * 机器=子单机器
-     *      * 人工 = 管理系统维护的用人数*机器
+     *      * 机器=sum(工时数)
+     *      * 人工 = 4*sum(工时数)
      *      * 折旧 = 机器
      *      * 其它 = 人工
      *      * 三层及其以上----------------------------------------
@@ -368,7 +368,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 //母工单报工
                 logger.info("==========================母工单报工开始");
                 pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback());
-                pHzWork.setSac1(sHzWorks.getSac1());
+                pHzWork.setSac2("4");//母单报工固定值
                 R sapR = this.reportHzToSap(pHzWork,2);
                 logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR));
                 return sapR;

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -578,7 +578,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 select
 					 workorder_code,
 					 sum(quantity_feedback) quantity_feedback,
-				     sum(round( work_time/use_man,2)) sac1,
+				     sum(work_time) sac1,
 		             use_man sac2,
 					 product_code,
 					 product_name

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -391,7 +391,10 @@ public class OpenServiceImpl implements OpenService {
         }
 
         /**qc_check_task**/
-
+        if("checkTypeSCXJ".equals(qcCheckTaskProduce.getCheckType())){
+            //巡检要求8-20点准点产生巡检任务。要求8点之前开始生产，那么第一条上位机触发的就当成模板
+            qcCheckTaskProduce.setDelFlag("1");
+        }
         qcCheckTaskProduce.setRecordId(beLongId);
         qcCheckTaskProduce.setFactoryCode(factoryCode);
         qcCheckTaskProduce.setCreateTime(nowDate);

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -179,7 +179,8 @@
 			   qct.confirm_man_name confirmManName
 		from qc_check_task qct
 		left join pro_order_workorder pow on qct.order_no = pow.workorder_code
-		where check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0'
+		where qct.check_type = 'checkTypeSCXJ' <!--and qct.del_flag = '0' 因为开始巡检第一个是删除标识的模板del_flag=1-->
+		  and pow.del_flag = '0'
 		  and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
 		  and pow.status = 'w2' and pow.parent_order = '0'
           group by qct.factory_code,

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java

@@ -228,7 +228,7 @@ public class SapOrderServiceImpl implements SapOrderService {
            // JCoDestination dest = SAPConnUtils.connect();
             log.info("订单关闭入参------"+sapCloseOrderQuery.toString());
             JCoRepository repository = dest.getRepository();
-            JCoFunction func = repository.getFunction("ZPPR_MES_PRODORD_CLOSE");
+            JCoFunction func = repository.getFunction("ZMES_AUFNR_CLOSE");
             if (func == null) {
                 throw new RuntimeException("Function does not exist in SAP");
             }