aps-工序作业计划流转卷数校验

aps-大屏

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportOrderFinishTableMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsReportOrderFinishTable;
+
+/**
+ * @Entity generator.domain.ApsReportOrderFinishTable
+ */
+public interface ApsReportOrderFinishTableMapper extends BaseMapper<ApsReportOrderFinishTable> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportOrderFinishTableService.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsReportOrderFinishTable;
+
+/**
+ *
+ */
+public interface ApsReportOrderFinishTableService extends IService<ApsReportOrderFinishTable> {
+
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -1240,7 +1240,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             //遍历输出物料
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : myOutMaterList) {
                 //遍历工序作业，计算 计划加工卷数合计
-                int planProcessRollAll = apsProcessOperationDo.getPlanprocessrall();
+//                int planProcessRollAll = apsProcessOperationDo.getPlanprocessrall();
                 //计算输出物料的 (计划输出卷数-计划备料卷数-计划成品卷数)值
                 int outputRollAll = apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanstockrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum();
                 //如果计划流转卷数不等于(计划输出卷数-计划备料卷数-计划成品卷数)，错误提示：{工序}{工序显示名}的{输出物料} 计划流转卷数不正确
@@ -1250,6 +1250,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 //如果有后道工序作业，并且计划流转卷数不等于所有后道工序作业计划加工卷数合计；错误提示：{工序}{工序显示名}的{输出物料} 计划流转卷数必须等于所有后道工序作业计划加工卷数合计；
                 //是否有后道工序
                 boolean haveNextProcess = false;
+                //后道工序作业的计划加工卷数
+                int nextProcessRollAll = 0;
                 //有后道工序作业，并且后道工序作业的输入物料ID=当前工序的输出物料ID
                 if (ObjectUtil.isNotEmpty(apsProcessOperationDo.getNextprocessid())) {
                     for (String s : apsProcessOperationDo.getNextprocessid().split(",")) {
@@ -1258,12 +1260,13 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 //后道工序作业的输入物料ID=当前工序的输出物料ID
                                 && nextProcessOperationDo.getPlaninputid().equals(apsProcessOperationOutMaterDo.getId())) {
                             haveNextProcess = true;
+                            nextProcessRollAll = nextProcessOperationDo.getPlanprocessrall();
                             break;
                         }
                     }
                 }
                 if (haveNextProcess) {
-                    if (planProcessRollAll != outputRollAll) {
+                    if (nextProcessRollAll != outputRollAll) {
                         return R.error(apsProcessOperationDo.getProcess() + apsProcessOperationDo.getProcessname() + "的" + apsProcessOperationOutMaterDo.getOutputmaterial() + " 计划流转卷数必须等于所有后道工序作业计划加工卷数合计");
                     }
                 } else {

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportOrderFinishTableServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsReportOrderFinishTableMapper;
+import com.rongwei.bscommon.sys.service.ApsReportOrderFinishTableService;
+import com.rongwei.bsentity.domain.ApsReportOrderFinishTable;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsReportOrderFinishTableServiceImpl extends ServiceImpl<ApsReportOrderFinishTableMapper, ApsReportOrderFinishTable>
+    implements ApsReportOrderFinishTableService {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsReportOrderFinishTableMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ApsReportOrderFinishTableMapper">
+
+    <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.ApsReportOrderFinishTable">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="tenantname" column="TENANTNAME" jdbcType="VARCHAR"/>
+            <result property="processworkshopid" column="PROCESSWORKSHOPID" jdbcType="VARCHAR"/>
+            <result property="processworkshop" column="PROCESSWORKSHOP" jdbcType="VARCHAR"/>
+            <result property="planproducevolume" column="PLANPRODUCEVOLUME" jdbcType="VARCHAR"/>
+            <result property="actualproducevolume" column="ACTUALPRODUCEVOLUME" jdbcType="VARCHAR"/>
+            <result property="yactualproducevolume" column="YACTUALPRODUCEVOLUME" jdbcType="VARCHAR"/>
+            <result property="completionratio" column="COMPLETIONRATIO" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,TENANTNAME,
+        PROCESSWORKSHOPID,PROCESSWORKSHOP,PLANPRODUCEVOLUME,
+        ACTUALPRODUCEVOLUME,YACTUALPRODUCEVOLUME,COMPLETIONRATIO
+    </sql>
+</mapper>

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsReportOrderFinishTable.java

@@ -0,0 +1,81 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * aps-大屏数据-订单完成情况表格
+ * @TableName aps_report_order_finish_table
+ */
+@TableName(value ="aps_report_order_finish_table")
+@Data
+public class ApsReportOrderFinishTable extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 工厂名称
+     */
+    @TableField(value = "TENANTNAME")
+    private String tenantname;
+
+    /**
+     * 车间ID
+     */
+    @TableField(value = "PROCESSWORKSHOPID")
+    private String processworkshopid;
+
+    /**
+     * 车间
+     */
+    @TableField(value = "PROCESSWORKSHOP")
+    private String processworkshop;
+
+    /**
+     * 本月计划完成（吨）
+     */
+    @TableField(value = "PLANPRODUCEVOLUME")
+    private String planproducevolume;
+
+    /**
+     * 本月实际已完成（吨）
+     */
+    @TableField(value = "ACTUALPRODUCEVOLUME")
+    private String actualproducevolume;
+
+    /**
+     * 昨日实际已完成（吨）
+     */
+    @TableField(value = "YACTUALPRODUCEVOLUME")
+    private String yactualproducevolume;
+
+    /**
+     * 本月实际已完成比例
+     */
+    @TableField(value = "COMPLETIONRATIO")
+    private String completionratio;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}