Merge remote-tracking branch 'origin/master'

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

op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java

@@ -31,6 +31,7 @@ public class DeviceTaskController {
      */
     @PostMapping("/createSpotCheckPlanTask")
     public R createSpotCheckPlanTask() {
+        System.out.println("点检判断");
         AjaxResult result = taskService.createSpotCheckPlanTask();
         if(result.isSuccess()){
             return R.ok("点检计划生成成功");
@@ -57,6 +58,7 @@ public class DeviceTaskController {
      */
     @PostMapping("/createMaintenancePlanTask")
     public R createMaintenancePlanTask() {
+        System.out.println("保养判断");
         AjaxResult result = taskService.createMaintenancePlanTask();
         if(result.isSuccess()){
             return R.ok("保养计划生成成功");

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -102,33 +102,41 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         List<EquOrder> handleList = new ArrayList<>();
         long nowTime = DateUtils.getNowDate().getTime();
         long dayMs = 86400000l;
+        long hourMs = 1000 * 60 * 60;
         if (orderList != null) {
             for (EquOrder order : orderList) {
                 long diff = nowTime - order.getCreateTime().getTime();
-                if (order.getPlanLoopType().equals("day")){
+                switch (order.getPlanLoopType()) {
+                    case "hour":
+                        if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) {
+                            handleList.add(order);
+                        }
+                        break;
+                    case "day":
                         if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) {
                             handleList.add(order);
                         }
-                }
+                        break;
-                if (order.getPlanLoopType().equals("week")){
+                    case "week":
                         if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) {
                             handleList.add(order);
                         }
-                }
+                        break;
-                if (order.getPlanLoopType().equals("month")){
+                    case "month":
                         if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) {
                             handleList.add(order);
                         }
-                }
+                        break;
-                if (order.getPlanLoopType().equals("season")){
+                    case "season":
                         if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) {
                             handleList.add(order);
                         }
-                }
+                        break;
-                if (order.getPlanLoopType().equals("year")){
+                    case "year":
                         if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) {
                             handleList.add(order);
                         }
+                        break;
                 }
             }
         }
@@ -664,6 +672,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
 
     /**
      * 查询设备
+     *
      * @param equipmentCode
      * @return
      */
@@ -992,6 +1001,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
 
     /**
      * 更新设备运行记录
+     *
      * @param equipmentCode
      * @param operationType 开机/停机
      * @param type          保养/维修

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java

@@ -180,6 +180,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
 
     /**
      * 设备运行记录生成
+     *
      * @return
      */
     @Override
@@ -213,6 +214,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
 
     /**
      * 设备运行记录数据库备份（每年）
+     *
      * @return
      */
     @Override
@@ -253,7 +255,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
 
         for (EquPlan plan : plans) {
             EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan);
-            if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){
+            if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) {
                 //生成点检计划
                 int m = this.createOrderPlan(plan);
                 if (m == 0) {
@@ -273,7 +275,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
 
         for (EquPlan plan : plans) {
             EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan);
-            if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){
+            if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) {
                 //生成巡检计划
                 int m = this.createOrderPlan(plan);
                 if (m == 0) {
@@ -303,7 +305,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
                 //单次生成保养计划
             }
 
-            if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){
+            if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) {
                 //生成保养计划
                 int m = this.createOrderPlan(plan);
                 if (m == 0) {
@@ -518,6 +520,21 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
         }
     }
 
+    // 循环类型为小时
+    private boolean checkHourTask(EquOrder order, EquPlan plan) {
+        if (order == null) {
+            return true;
+        }
+        Long loop = 1L;
+        Long diff = 0L;
+
+        if (plan.getPlanLoopType().equals("hour")) {
+            loop = Long.valueOf(plan.getPlanLoop()) * 60 * 60 * 1000;
+            diff = DateUtils.getNowDate().getTime() - order.getCreateTime().getTime();
+        }
+        return diff >= loop;
+    }
+
     public static void main(String[] args) {
 
         int batchSize = 200;// 批次数量

op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml

@@ -38,12 +38,12 @@
     </select>
     <select id="getNewTaskOrder" resultType="com.op.device.domain.EquOrder">
         select top 1 order_code orderCode,
-                     create_time createTime,
+                     create_time createTime
-        <if test='planLoopType=="day"'> DATEDIFF (day, create_time, GETDATE()) days </if>
+        <if test="planLoopType=='day'">, DATEDIFF (day, create_time, GETDATE()) days </if>
-        <if test='planLoopType=="week"'> DATEDIFF (week, create_time, GETDATE()) days </if>
+        <if test="planLoopType=='week'">, DATEDIFF (week, create_time, GETDATE()) days </if>
-        <if test='planLoopType=="month"'> DATEDIFF (month, create_time, GETDATE()) days </if>
+        <if test="planLoopType=='month'">, DATEDIFF (month, create_time, GETDATE()) days </if>
-        <if test='planLoopType=="season"'> DATEDIFF (month, create_time, GETDATE())/3 days </if>
+        <if test="planLoopType=='season'">, DATEDIFF (month, create_time, GETDATE())/3 days </if>
-        <if test='planLoopType=="year"'> DATEDIFF (year, create_time, GETDATE()) days </if>
+        <if test="planLoopType=='year'">, DATEDIFF (year, create_time, GETDATE()) days </if>
         from equ_order
         where plan_type = #{planType} and plan_code = #{planCode} and equipment_code = #{equipmentCode}
         order by create_time desc

op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml

@@ -177,7 +177,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="spareInventoryFloor != null  and spareInventoryFloor != ''"> and womsn.spare_inventory_floor = #{spareInventoryFloor}</if>
 			<if test="spareInventoryUpper != null  and spareInventoryUpper != ''"> and womsn.spare_inventory_upper = #{spareInventoryUpper}</if>
 			<if test="spareType != null  and spareType != ''"> and womsn.spare_type = #{spareType}</if>
-
 			<if test="ownEquipmentName != null  and ownEquipmentName != ''"> and womsna.own_equipment_name like concat('%', #{ownEquipmentName}, '%')</if>
 			and womsn.del_flag = '0'
 		</where>

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -411,6 +411,11 @@ public class MesReportWorkController extends BaseController {
 		return rlist;
 	}
 
+	/**获取报工打印信息**/
+	@PutMapping("/getPutInOrderList")
+	public AjaxResult getPutInOrderList(@RequestBody MesReportWork mesReportWorks) {
+		return success(mesReportWorkService.getPutInOrderList(mesReportWorks));
+	}
 
 	public static void main(String args[]){
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java

@@ -221,6 +221,35 @@ public class MesReportWork extends BaseEntity {
 	private String workCenter;
 	private String shiftId;
 	private String keywords;
+	private String workshopName;
+	//凭证
+	private String voucher;
+	//版本
+	private String version;
+
+	public String getVoucher() {
+		return voucher;
+	}
+
+	public void setVoucher(String voucher) {
+		this.voucher = voucher;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public String getWorkshopName() {
+		return workshopName;
+	}
+
+	public void setWorkshopName(String workshopName) {
+		this.workshopName = workshopName;
+	}
 
 	public String getKeywords() {
 		return keywords;

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -129,4 +129,6 @@ public interface MesReportWorkMapper {
 	List<MesReportWork> selectMesReportWorkList_S(MesReportWork mesReportWork);
 
     int reportSapCancel(MesReportWork mesReportWork);
+
+    List<MesReportWork> getPutInOrderList(MesReportWork mesReportWorks);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java

@@ -103,4 +103,6 @@ public interface IMesReportWorkService {
 	List<MesReportWork> selectMesReportWorkList_S(MesReportWork mesReportWork);
 
     int reportSapCancel(MesReportWork mesReportWork);
+
+	List<MesReportWork> getPutInOrderList(MesReportWork mesReportWorks);
 }

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

@@ -184,6 +184,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		return m;
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public List<MesReportWork> getPutInOrderList(MesReportWork mesReportWorks) {
+		return mesReportWorkMapper.getPutInOrderList(mesReportWorks);
+	}
+
 	/**
 	 * 修改报工报表
 	 *
@@ -458,8 +464,6 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		return dtos;
 	}
 
-
-
 	public static void main(String[] args) {
 		Calendar calendar = Calendar.getInstance();
 		Date now = calendar.getTime();

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

@@ -640,6 +640,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		ORDER BY
 		mrw.create_time DESC
 	</select>
+    <select id="getPutInOrderList" resultType="com.op.mes.domain.MesReportWork">
+		select mrw.workorder_code workorderCode,
+			   pow.workorder_code_sap workorderCodeSap,
+			   pow.product_code productCode,
+			   pow.product_name productName,
+			   mrw.batch,
+			   mrw.quantity quantity,
+			   mrw.quantity_feedback quantityFeedback,
+			   mrw.unit,
+			   pow.factory_code factoryCode,
+			   equ.workshop_name workshopName,
+			   pow.attr2 version
+		from mes_report_work mrw
+		left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
+		left join base_equipment equ on equ.equipment_code = mrw.machine_code
+		left join pro_order po on po.order_code = pow.order_code
+		where mrw.parent_order = '0'
+		  and mrw.workorder_code = #{workorderCode}
+		  and mrw.del_flag = '0' and po.del_flag = '0'
+	</select>
 
     <insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java

@@ -101,7 +101,7 @@ public class ProOrder extends TreeEntity {
 	/** $column.columnComment */
 	private String atrr1;
 
-	/** $column.columnComment */
+	/** 订单版本*/
 	private String atrr2;
 
 	/** $column.columnComment */

op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java

@@ -240,10 +240,10 @@ public class QuaController extends BaseController {
     }
 
     /**不良类型**/
-    @PutMapping("/getDefectListPDA")
+    @PostMapping("/getDefectListPDA")
     public List<QcDefectType> getDefectListPDA(@RequestBody QcDefectType qcDefectType) {
         DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode());
-        return qcCheckTaskIncomeService.getDefectList(qcDefectType);
+        return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType);
     }
 
     /**获取生产工单列表**/

op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java

@@ -73,6 +73,15 @@ public class QcDefectType extends BaseEntity {
 
 	// 创建日期结束
 	private String createTimeEnd;
+	private String checkType;
+
+	public String getCheckType() {
+		return checkType;
+	}
+
+	public void setCheckType(String checkType) {
+		this.checkType = checkType;
+	}
 
 	public List<Date> getCreateTimeArray() {
 		return createTimeArray;

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java

@@ -89,4 +89,6 @@ public interface QcCheckUnqualifiedMapper {
 	int repeatCheckTaskDefect(QcCheckTaskIncome recheck);
 	int repeatCheckTaskDetail(QcCheckTaskIncome recheck);
 	int repeatCheckTaskUser(QcCheckTaskIncome recheck);
+
+	List<QcDefectType> getDefectListPDA(QcDefectType qcDefectType);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java

@@ -89,4 +89,6 @@ public interface IQcCheckTaskIncomeService {
     List<QcCheckTaskIncome> getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
 
     List<QcCheckTaskIncome> getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome);
+
+	List<QcDefectType> getDefectListPDA(QcDefectType qcDefectType);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -170,6 +170,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			return 0;//没有找到检测项目
 		}
 
+		/**qc_sample_rule**/
+		QcCheckTaskIncome sampQua = new QcCheckTaskIncome();
+		sampQua.setCheckType(qcCheckTaskIncome.getCheckType());
+		sampQua.setQuality(qcCheckTaskIncome.getQuality());
+		String sampNum = qcSampleRuleMapper.getSampNum(sampQua);
+		if(StringUtils.isNotBlank(sampNum)){
+			qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum));
+		}
+
 		/**qc_check_task**/
 		String beLongId = IdUtils.fastSimpleUUID();
 		qcCheckTaskIncome.setRecordId(beLongId);
@@ -238,11 +247,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			}
 		}
 		qcCheckTaskIncome.setNoOkQuality(noOkQuality);
-		/**qc_sample_rule**/
-        String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome);
-        if(StringUtils.isNotBlank(sampNum)){
-			qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum));
-		}
 		/**qc_check_task**/
 		qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
 
@@ -478,6 +482,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		return qcCheckUnqualifiedMapper.getDefectList(qcDefectType);
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public List<QcDefectType> getDefectListPDA(QcDefectType qcDefectType) {
+		return qcCheckUnqualifiedMapper.getDefectListPDA(qcDefectType);
+	}
+
 	@Override
 	@DS("#header.poolName")
 	public List<QcCheckTaskIncome> getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java

@@ -79,6 +79,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 	@Autowired
 	private IQcCheckTaskDefectService qcCheckTaskDefectService;
 
+	@Autowired
+	private QcSampleRuleMapper qcSampleRuleMapper;
+
     /**
      * 查询生产过程检验任务
      *
@@ -226,6 +229,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 			}
 		}
 		qcCheckTaskProduce.setNoOkQuality(noOkQuality);
+
+		/**qc_sample_rule**/
+		QcCheckTaskIncome sampQua = new QcCheckTaskIncome();
+		sampQua.setCheckType(qcCheckTaskProduce.getCheckType());
+		sampQua.setQuality(qcCheckTaskProduce.getQuality());
+		String sampNum = qcSampleRuleMapper.getSampNum(sampQua);
+		if(StringUtils.isNotBlank(sampNum)){
+			qcCheckTaskProduce.setSampleQuality(new BigDecimal(sampNum));
+		}
+
 		/**qc_check_task**/
         qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
 

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java

@@ -56,6 +56,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 	private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
 	@Autowired
 	private IQcCheckTaskDefectService qcCheckTaskDefectService;
+	@Autowired
+	private QcSampleRuleMapper qcSampleRuleMapper;
 
 	/**
 	 * 查询成品入库检验任务
@@ -208,7 +210,14 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 			}
 		}
 		qcCheckTaskWarehousing.setNoOkQuality(noOkQuality);
-
+		/**qc_sample_rule**/
+		QcCheckTaskIncome sampQua = new QcCheckTaskIncome();
+		sampQua.setCheckType(qcCheckTaskWarehousing.getCheckType());
+		sampQua.setQuality(qcCheckTaskWarehousing.getQuality());
+		String sampNum = qcSampleRuleMapper.getSampNum(sampQua);
+		if(StringUtils.isNotBlank(sampNum)){
+			qcCheckTaskWarehousing.setSampleQuality(new BigDecimal(sampNum));
+		}
         /**qc_check_task**/
 		int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing);
 		logger.info("qc_check_task:"+n+"成功");

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

@@ -138,6 +138,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="orderNo != null">and wpp.work_order like concat like ('%',#{orderNo})</if>
 		order by wpp.create_time desc
 	</select>
+	<select id="getDefectListPDA" resultType="com.op.quality.domain.QcDefectType">
+		select qdt.defect_code defectCode,
+			   qdt.defect_subclass defectSubclass
+		from qc_defect_type qdt
+		left join qc_check_type qct on qdt.defect_type = qct.type_code
+		where qct.order_code = #{checkType} and qdt.del_flag='0'
+		order by qdt.create_time
+	</select>
 
 	<insert id="insertQcCheckUnqualified" parameterType="QcCheckUnqualified">
 		insert into qc_check_unqualified

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

@@ -93,6 +93,9 @@ public class SapOrderServiceImpl implements SapOrderService {
             }
 
 
+
+
+
             func.execute(dest);//执行调用函数
             // 获取 内表 - ZMES_PRO
             JCoTable maraTable = func.getTableParameterList().getTable("ZMES_PRO");
@@ -118,8 +121,7 @@ public class SapOrderServiceImpl implements SapOrderService {
                 String ERDAT = maraTable.getString("ERDAT");
                 String STTXT = maraTable.getString("STTXT");
                 String VERID = maraTable.getString("VERID");
-
+                log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + "-生产版本:"+ VERID +" -上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
-                log.info("订单输出------：" + "订单号：" + AUFNR + " - 订单类型：" + AUART + " - 生产版本：" + VERID + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
                         + " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP
                         + " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT);
 //                System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
@@ -183,7 +185,6 @@ public class SapOrderServiceImpl implements SapOrderService {
                     jCoParameterList.setValue("P_QUANTITY",sapCreateOrder.getQuantity());
                     jCoParameterList.setValue("P_DATES",sapCreateOrder.getDates());
                     jCoParameterList.setValue("P_DATEE",sapCreateOrder.getDatee());
-                    jCoParameterList.setValue("P_VERID", sapCreateOrder.getVerid());
                     func.execute(dest);//执行调用函数
                     JCoParameterList J= func.getExportParameterList();
                     System.out.println(func.getExportParameterList());
@@ -214,6 +215,7 @@ public class SapOrderServiceImpl implements SapOrderService {
 
     @Override
     public R sapCloseOrder(SapCloseOrderQuery sapCloseOrderQuery) {
+
         StringBuilder Msg = new StringBuilder();
         try {
             //获取连接
@@ -240,6 +242,7 @@ public class SapOrderServiceImpl implements SapOrderService {
 //             System.out.println(J);
              String L_MSG1= func.getExportParameterList().getString("L_MSG");
              Msg.append(sapCloseOrderQuery.getLeadOrder()+L_MSG1+";");
+
              //关闭子订单
             jCoParameterList.setValue("P_AUFNR",sapCloseOrderQuery.getOrder());
             func.execute(dest);//执行调用函数
@@ -289,6 +292,7 @@ public class SapOrderServiceImpl implements SapOrderService {
              * 生产订单报工工时 LT_GS
              */
             JCoTable LT_GS_jCoTable = func.getTableParameterList().getTable("LT_GS");
+           // System.out.println("LT_GS_jCoTable"+LT_GS_jCoTable);
             LT_GS_jCoTable.appendRow();
             LT_GS_jCoTable.setValue("CONF_ACTIVITY1", sapRFW.getLt_gs().getConf_activity1());
             LT_GS_jCoTable.setValue("CONF_ACTIVITY2", sapRFW.getLt_gs().getConf_activity2());
@@ -300,20 +304,24 @@ public class SapOrderServiceImpl implements SapOrderService {
              * MES生产订单报工货物移动修改 LT_HW
              */
             JCoTable LT_HW_jCoTable = func.getTableParameterList().getTable("LT_HW");
+            //System.out.println("LT_HW_jCoTable"+LT_HW_jCoTable);
             for (SapRFW.lt_hw lt_hw:sapRFW.getLt_hwList()){
                 LT_HW_jCoTable.appendRow();
                 LT_HW_jCoTable.setValue("MATERIAL", lt_hw.getMaterial());
                 LT_HW_jCoTable.setValue("ENTRY_QNT", lt_hw.getEntry_qnt());
             }
+
+
             func.execute(dest);//执行调用函数
+            JCoParameterList J= func.getExportParameterList();
+            System.out.println(func.getExportParameterList());
             String RETCODE= func.getExportParameterList().getString("RETCODE");
             MESSAGE= func.getExportParameterList().getString("MESSAGE");
-            if (Constants.RFW_FAIL.equals(RETCODE)) {
+            if (Constants.FAIL.equals(RETCODE)){
-                log.error("订单号:" + sapRFW.getAufnr() + "报工失败" + MESSAGE);
                 return R.fail("订单号:"+sapRFW.getAufnr()+"报工失败"+MESSAGE);
             }
-            log.error("订单号:" + sapRFW.getAufnr() + "报工成功" + MESSAGE);
             return R.ok("",MESSAGE);
+
         }catch (Exception e){
             return R.fail(e.getMessage());
         }
@@ -425,6 +433,7 @@ public class SapOrderServiceImpl implements SapOrderService {
         }catch (Exception e){
             return R.fail(e.getMessage());
         }
+
     }
 
     @Override
@@ -439,10 +448,12 @@ public class SapOrderServiceImpl implements SapOrderService {
             if (func == null) {
                 throw new RuntimeException("Function does not exist in SAP");
             }
-            if (StringUtils.isEmpty(sapProOrder.getAufnr())) {
+            if (StringUtils.isEmpty(sapProOrder.getAufnr()))
+            {
                 return R.fail("订单号为空！");
             }
-            if (StringUtils.isEmpty(sapProOrder.getQuantity())) {
+            if (StringUtils.isEmpty(sapProOrder.getQuantity()))
+            {
                 return R.fail("数量为空！");
             }
 

op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java

@@ -171,7 +171,6 @@ public class ProProcessController extends BaseController {
      */
     @GetMapping("/getWorkCenterList")
     public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
-        startPage();
         List<SysFactory> list = proProcessService.getWorkCenterList(sysFactory);
         return getDataTable(list);
     }
@@ -181,9 +180,8 @@ public class ProProcessController extends BaseController {
      */
 
     @GetMapping("/getEquipmentTypeList")
-    public TableDataInfo getEquipmentTypeList(Equipment equipment) {
+    public AjaxResult getEquipmentTypeList(Equipment equipment) {
-        startPage();
         List<Equipment> list = proProcessService.getEquipmentTypeList(equipment);
-        return getDataTable(list);
+        return success(list);
     }
 }

op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml

@@ -324,6 +324,7 @@
 		from base_equipment
 		where del_flag = '0'
 		group by equipment_type_code,equipment_type_name
+		order by equipment_type_name desc
 	</select>
 
 </mapper>