Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

Conflicts: modules/i3plus-pojo-andon/pom.xml modules/i3plus-pojo-aps/pom.xml modules/i3plus-pojo-base/pom.xml modules/i3plus-pojo-bsp/pom.xml modules/i3plus-pojo-form/pom.xml modules/i3plus-pojo-hardswitch/pom.xml modules/i3plus-pojo-ics/pom.xml modules/i3plus-pojo-jobflow/pom.xml modules/i3plus-pojo-lac/pom.xml modules/i3plus-pojo-mdm/pom.xml modules/i3plus-pojo-mes-pcn/pom.xml modules/i3plus-pojo-mes/pom.xml modules/i3plus-pojo-model/pom.xml modules/i3plus-pojo-platform/pom.xml modules/i3plus-pojo-ptl/pom.xml modules/i3plus-pojo-report/pom.xml modules/i3plus-pojo-screen/pom.xml modules/i3plus-pojo-softswitch/pom.xml modules/i3plus-pojo-sweb/pom.xml modules/i3plus-pojo-wms/pom.xml modules/i3plus-pojo-workflow/pom.xml pom.xml sonar-project.properties
4 years ago · d7b34facf0
parent e44798bd4a db9dcabf1f
commit d7b34facf0
21 changed files with 28 additions and 20 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -36,7 +36,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -49,7 +49,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-bsp/pom.xml
+++ b/modules/i3plus-pojo-bsp/pom.xml
@ -35,7 +35,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -34,7 +34,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -26,7 +26,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -26,7 +26,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@ -27,7 +27,11 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = {
+@Table(name = "IF_PRODUCT_OFF_LINE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "VIN_CODE")
+}, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"})
 })
@NoArgsConstructor
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java
@ -56,4 +56,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable {
    @Transient
    @ApiParam("班次名称")
    private String shiftName;
+
+    @Transient
+    @ApiParam("是否跨天")
+    private boolean isNextDay;
 }
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -82,7 +82,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -33,7 +33,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -33,7 +33,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -32,7 +32,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -50,7 +50,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -26,7 +26,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>
--- a/pom.xml
+++ b/pom.xml
@ -251,7 +251,7 @@
        <profile>
            <id>test</id>
            <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
            </properties>
        </profile>
        <profile>