修改销售计量

pom.xml

@@ -194,7 +194,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>TMSTRUCK_WEIGHT_RESULT</table>
+                        <table>OMSTRUCK_ORDER</table>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -37,4 +38,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> selecrCloseEntryMes(BigDecimal saleMaterialId);
 
+    List<BigDecimal> selectOrderInfo(@Param("orderNumber") String orderNumber, @Param("wagonNo") String wagonNo);
+
 }

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -76,7 +76,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private Date insertTime;
 
     /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录修改人",required=false)
     private String updateUsername;
@@ -88,7 +88,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private Date updateTime;
 
     /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
@@ -100,9 +100,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
+     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单25:倒库 26:计次）(ORDER_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
+    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单25:倒库 26:计次）",required=false)
     private BigDecimal orderType;
 
     /**
@@ -177,6 +177,24 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否可作业",required=false)
     private BigDecimal canWork;
 
+    /**
+     * 打印次数(PRINTNUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="打印次数",required=false)
+    private BigDecimal printnumber;
+
+    /**
+     * 运力ids(CAPACITYIDS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="运力ids",required=false)
+    private String capacityids;
+
+    /**
+     * 异地库是否验收(IS_ACCEPT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="异地库是否验收",required=false)
+    private BigDecimal isAccept;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -413,6 +431,30 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.canWork = canWork;
     }
 
+    public BigDecimal getPrintnumber() {
+        return printnumber;
+    }
+
+    public void setPrintnumber(BigDecimal printnumber) {
+        this.printnumber = printnumber;
+    }
+
+    public String getCapacityids() {
+        return capacityids;
+    }
+
+    public void setCapacityids(String capacityids) {
+        this.capacityids = capacityids == null ? null : capacityids.trim();
+    }
+
+    public BigDecimal getIsAccept() {
+        return isAccept;
+    }
+
+    public void setIsAccept(BigDecimal isAccept) {
+        this.isAccept = isAccept;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -447,6 +489,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", driverTel=").append(driverTel);
         sb.append(", optionerCode=").append(optionerCode);
         sb.append(", canWork=").append(canWork);
+        sb.append(", printnumber=").append(printnumber);
+        sb.append(", capacityids=").append(capacityids);
+        sb.append(", isAccept=").append(isAccept);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1016,35 +1016,52 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Transactional(rollbackFor = {Exception.class})
     public int receiveOrderResult(Map<String, Object> map) throws Exception {
         int result=0;
-        OmstrainOrder omstrainOrder = new OmstrainOrder();
+
         //获取运输订单号
         Object orderNumber = map.get("orderNumber");
+        Object receviceOrNot = map.get("receviceOrNot");
         //获取备注-如果是异常情况，填写备注。
         Object remark = map.get("remark");
-        if (remark!=null){
-            omstrainOrder.setAcceptRemark((String) remark);
-        }
-        //接收车皮号
-        Object wagonNo = map.get("wagonNo");
-        BigDecimal orderId = omstrainOrderMapper.selectOrderIdBywagonNoAndOrderNumber((String) orderNumber, (String) wagonNo);
-        if (orderId==null){
-            throw new Exception("提示回传车皮号与运输订单号不匹配");
-        }
-        //根据运输订单号查找id
-        omstrainOrder.setOrderId(orderId);
-        //接收是否收货(0为未收货，1为已收货)
-        Object receviceOrNot = map.get("receviceOrNot");
-        omstrainOrder.setIsAccept(DataChange.dataToBigDecimal(receviceOrNot));
-        //接收时间
         String receviceTime2 =(String) map.get("receviceTime");
         SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            Date receviceTime = sdf2.parse(receviceTime2);
+        Date receviceTime = sdf2.parse(receviceTime2);
+        Object transportType = map.get("transportType");
+        Object wagonNo = map.get("wagonNo");
+        if(transportType != null && transportType.equals("汽运")) {
+            List<BigDecimal> orderIds = omstruckOrderMapper.selectOrderInfo((String) orderNumber,(String) wagonNo );
+            if(orderIds.size() == 0) {
+                throw new Exception("提示回传车皮号与运输订单号不匹配");
+            }
+            for (BigDecimal orderId : orderIds) {
+                OmstruckOrder omstruckOrder = new OmstruckOrder();
+                omstruckOrder.setOrderId(orderId);
+                if (remark != null) {
+                    omstruckOrder.setInsertUpdateRemark((String) remark);
+                }
+                omstruckOrder.setIsAccept(DataChange.dataToBigDecimal(receviceOrNot));
+                omstruckOrder.setUpdateTime(receviceTime);
+                result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            }
+        }else {
+            OmstrainOrder omstrainOrder = new OmstrainOrder();
+            if (remark!=null){
+                omstrainOrder.setAcceptRemark((String) remark);
+            }
+            //接收车皮号
+            BigDecimal orderId = omstrainOrderMapper.selectOrderIdBywagonNoAndOrderNumber((String) orderNumber, (String) wagonNo);
+            if (orderId==null){
+                throw new Exception("提示回传车皮号与运输订单号不匹配");
+            }
+            //根据运输订单号查找id
+            omstrainOrder.setOrderId(orderId);
+            //接收是否收货(0为未收货，1为已收货)
+            omstrainOrder.setIsAccept(DataChange.dataToBigDecimal(receviceOrNot));
+            //接收时间
             omstrainOrder.setIsAcceptTime(receviceTime);
-        } catch (ParseException e) {
-            e.printStackTrace();
+            result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
         }
-       result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
+
+
         return result;
     }
 

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

@@ -30,13 +30,17 @@
         <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
         <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
         <result column="CAN_WORK" jdbcType="DECIMAL" property="canWork" />
+        <result column="PRINTNUMBER" jdbcType="DECIMAL" property="printnumber" />
+        <result column="CAPACITYIDS" jdbcType="VARCHAR" property="capacityids" />
+        <result column="IS_ACCEPT" jdbcType="DECIMAL" property="isAccept" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
     ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
-    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK,
+    PRINTNUMBER, CAPACITYIDS, IS_ACCEPT
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
@@ -44,7 +48,7 @@
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
     t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
     t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
-    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK
+    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK, t.PRINTNUMBER, t.CAPACITYIDS, t.IS_ACCEPT
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -138,6 +142,15 @@
             <if test="canWork != null">
                 and CAN_WORK = #{canWork}
             </if>
+            <if test="printnumber != null">
+                and PRINTNUMBER = #{printnumber}
+            </if>
+            <if test="capacityids != null and capacityids != ''">
+                and CAPACITYIDS = #{capacityids}
+            </if>
+            <if test="isAccept != null">
+                and IS_ACCEPT = #{isAccept}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -226,9 +239,18 @@
             <if test="canWork != null">
                 and CAN_WORK = #{canWork}
             </if>
+            <if test="printnumber != null">
+                and PRINTNUMBER = #{printnumber}
+            </if>
+            <if test="capacityids != null and capacityids != ''">
+                and CAPACITYIDS LIKE '%${capacityids}%'
+            </if>
+            <if test="isAccept != null">
+                and IS_ACCEPT = #{isAccept}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -316,6 +338,15 @@
         <if test="canWork != null">
             or CAN_WORK = #{canWork}
         </if>
+        <if test="printnumber != null">
+            or PRINTNUMBER = #{printnumber}
+        </if>
+        <if test="capacityids != null and capacityids != ''">
+            or CAPACITYIDS = #{capacityids}
+        </if>
+        <if test="isAccept != null">
+            or IS_ACCEPT = #{isAccept}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -327,7 +358,8 @@
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
                                     DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
                                     TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
-                                    OPTIONER_CODE, CAN_WORK)
+                                    OPTIONER_CODE, CAN_WORK, PRINTNUMBER,
+                                    CAPACITYIDS, IS_ACCEPT)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
@@ -337,7 +369,8 @@
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
                 #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
                 #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
-                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL})
+                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL}, #{printnumber,jdbcType=DECIMAL},
+                #{capacityids,jdbcType=VARCHAR}, #{isAccept,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -426,6 +459,15 @@
             <if test="canWork != null">
                 CAN_WORK,
             </if>
+            <if test="printnumber != null">
+                PRINTNUMBER,
+            </if>
+            <if test="capacityids != null">
+                CAPACITYIDS,
+            </if>
+            <if test="isAccept != null">
+                IS_ACCEPT,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -512,6 +554,15 @@
             <if test="canWork != null">
                 #{canWork,jdbcType=DECIMAL},
             </if>
+            <if test="printnumber != null">
+                #{printnumber,jdbcType=DECIMAL},
+            </if>
+            <if test="capacityids != null">
+                #{capacityids,jdbcType=VARCHAR},
+            </if>
+            <if test="isAccept != null">
+                #{isAccept,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -542,7 +593,10 @@
             ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
             DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
             OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
-            CAN_WORK = #{canWork,jdbcType=DECIMAL}
+            CAN_WORK = #{canWork,jdbcType=DECIMAL},
+            PRINTNUMBER = #{printnumber,jdbcType=DECIMAL},
+            CAPACITYIDS = #{capacityids,jdbcType=VARCHAR},
+            IS_ACCEPT = #{isAccept,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -629,10 +683,19 @@
             <if test="canWork != null">
                 CAN_WORK = #{canWork,jdbcType=DECIMAL},
             </if>
+            <if test="printnumber != null">
+                PRINTNUMBER = #{printnumber,jdbcType=DECIMAL},
+            </if>
+            <if test="capacityids != null">
+                CAPACITYIDS = #{capacityids,jdbcType=VARCHAR},
+            </if>
+            <if test="isAccept != null">
+                IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -657,7 +720,8 @@
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
         DRIVER_CONFIRMATION, PRICE_ID,
         CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
-        DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+        DRIVER_TEL, OPTIONER_CODE, CAN_WORK,
+        PRINTNUMBER, CAPACITYIDS, IS_ACCEPT
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
@@ -672,7 +736,8 @@
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
         #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
         #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
-        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL}
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL},
+        #{item.printnumber,jdbcType=DECIMAL}, #{item.capacityids,jdbcType=VARCHAR}, #{item.isAccept,jdbcType=DECIMAL}
         from dual
     </foreach> )
     </insert>
@@ -791,6 +856,18 @@
         <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.canWork,jdbcType=DECIMAL}
         </foreach>
+        ,PRINTNUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.printnumber,jdbcType=DECIMAL}
+        </foreach>
+        ,CAPACITYIDS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityids,jdbcType=VARCHAR}
+        </foreach>
+        ,IS_ACCEPT=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.isAccept,jdbcType=DECIMAL}
+        </foreach>
         where ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}
@@ -805,6 +882,10 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
     <select id="findCarNumberByOrderId" parameterType="DECIMAL" resultType="java.util.Map" >
         SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum",
@@ -906,4 +987,11 @@
               LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
     </select>
+    <select id="selectOrderInfo" resultType="java.math.BigDecimal" >
+        SELECT DISTINCT  OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{wagonNo}
+        AND OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>

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

@@ -970,7 +970,7 @@
         from (
                  select OO.ORDER_ID               "orderId",
                         OO.ORDER_TYPE             "orderTypee",
-                        OO.ORDER_NUMBER           "orderNumber",
+                        OO.ORDER_NUMBER           "orderNo",
                         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
                         TTR.RESULT_TOTAL_ID       "resultTotalId",
                         TWR.TARE_SEGMENT_SQE      "tareSegmentSqe",

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout