'销售master终版'

pom.xml

@@ -140,6 +140,46 @@
                     </execution>
                 </executions>
             </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.steerinfo</groupId>-->
+<!--                <artifactId>generator-maven-plugin</artifactId>-->
+<!--                <version>3.0</version>-->
+<!--                <configuration>-->
+<!--                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
+<!--                    <user>dagang</user>-->
+<!--                    <password>root123</password>-->
+<!--                    &lt;!&ndash;包名&ndash;&gt;-->
+<!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
+<!--                    <tables>-->
+<!--                        <table>OMSTRUCK_ORDER_MATERIAL</table>&lt;!&ndash;销售计划&ndash;&gt;-->
+<!--                        &lt;!&ndash;                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;&ndash;&gt;-->
+<!--                        &lt;!&ndash;                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;&ndash;&gt;-->
+<!--                        &lt;!&ndash;                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;&ndash;&gt;-->
+<!--                        &lt;!&ndash;                        <param>AMS_SALE_ORDER_MATERIAL</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;&ndash;&gt;-->
+<!--                        &lt;!&ndash;                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;&ndash;&gt;-->
+<!--                    </tables>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal></goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+                        <plugin>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-maven-plugin</artifactId>
+                            <version>2.2.6.RELEASE</version>
+                            <executions>
+                                <execution>
+                                    <goals>
+                                        <goal>repackage</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
         </plugins>
         <resources>
             <resource>

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.xml

@@ -608,7 +608,7 @@
         LEFT JOIN DIL_BATCH DB
         ON APO.BATCH_ID = DB.BATCH_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        ON RM.MATERIAL_ID = ARM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -24,14 +24,14 @@
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
         <result column="REQUIREMENT_UNLOAD_UNIT_ID" jdbcType="DECIMAL" property="requirementUnloadUnitId" />
-        <result column="REQUIREMENT_PLATFORM_ID " jdbcType="DECIMAL" property="requirementPlatformId" />
+        <result column="REQUIREMENT_PLATFORM_ID" jdbcType="DECIMAL" property="requirementPlatformId" />
     </resultMap>
     <sql id="columns">
         REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
     REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT, 
     LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
     REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID "
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID"
     </sql>
     <sql id="columns_alias">
         t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
@@ -39,7 +39,7 @@
     t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION, 
     t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.REQUIREMENT_UNLOAD_UNIT_ID, t."REQUIREMENT_PLATFORM_ID "
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t."REQUIREMENT_PLATFORM_ID"
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -116,7 +116,7 @@
                 and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
             </if>
             <if test="requirementPlatformId != null">
-                and REQUIREMENT_PLATFORM_ID  = #{requirementPlatformId}
+                and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
             </if>
         </where>
     </sql>
@@ -189,7 +189,7 @@
                 and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
             </if>
             <if test="requirementPlatformId != null">
-                and REQUIREMENT_PLATFORM_ID  = #{requirementPlatformId}
+                and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
             </if>
         </where>
     </sql>
@@ -264,7 +264,7 @@
             or REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
         </if>
         <if test="requirementPlatformId != null">
-            or REQUIREMENT_PLATFORM_ID  = #{requirementPlatformId}
+            or REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
         </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -276,7 +276,7 @@
                                                  REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME,
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                  INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID,
-                                                 "REQUIREMENT_PLATFORM_ID ")
+                                                 "REQUIREMENT_PLATFORM_ID")
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
                 #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=DECIMAL},
@@ -357,7 +357,7 @@
                 REQUIREMENT_UNLOAD_UNIT_ID,
             </if>
             <if test="requirementPlatformId != null">
-                "REQUIREMENT_PLATFORM_ID ",
+                "REQUIREMENT_PLATFORM_ID",
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -455,7 +455,7 @@
             INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             DELETED = #{deleted,jdbcType=DECIMAL},
             REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
-            "REQUIREMENT_PLATFORM_ID " = #{requirementPlatformId,jdbcType=DECIMAL}
+            "REQUIREMENT_PLATFORM_ID" = #{requirementPlatformId,jdbcType=DECIMAL}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -525,7 +525,7 @@
                 REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
             </if>
             <if test="requirementPlatformId != null">
-                "REQUIREMENT_PLATFORM_ID " = #{requirementPlatformId,jdbcType=DECIMAL},
+                "REQUIREMENT_PLATFORM_ID" = #{requirementPlatformId,jdbcType=DECIMAL},
             </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
@@ -555,7 +555,7 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
-        REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID "
+        REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID"
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
@@ -665,7 +665,7 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementUnloadUnitId,jdbcType=DECIMAL}
         </foreach>
-        ,"REQUIREMENT_PLATFORM_ID "=
+        ,"REQUIREMENT_PLATFORM_ID"=
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementPlatformId,jdbcType=DECIMAL}
         </foreach>