Merge remote-tracking branch 'origin/master'

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,8 +640,28 @@ 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 id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null">id,</if>

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

@@ -120,7 +120,8 @@ public class SapOrderServiceImpl implements SapOrderService {
                 String ERNAM = maraTable.getString("ERNAM");
                 String ERDAT = maraTable.getString("ERDAT");
                 String STTXT = maraTable.getString("STTXT");
-                log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX
+                String VERID = maraTable.getString("VERID");
+                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
@@ -131,6 +132,7 @@ public class SapOrderServiceImpl implements SapOrderService {
                 proOrder.setPlanFactoryCode(PWERK);
                 proOrder.setOrderCode(AUFNR);
                 proOrder.setOrderType(AUART);
+                proOrder.setAtrr2(VERID);
                 proOrder.setProdCode(PLNBEZ);
                 proOrder.setProdDesc(MAKTX);
                 proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf("."))));