luobang 1 年之前
父节点
当前提交
ee5182be54

+ 1 - 1
pom.xml

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

+ 2 - 4
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1377,9 +1377,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Transactional(rollbackFor = {Exception.class})
     public int receiveOrderResult(Map<String, Object> map) throws Exception {
         int result=0;
-        System.out.println("异地库回传接口");
+        System.out.println("异地库回传接口" + new Date());
         System.out.println(map);
-        System.out.println("异地库回传接口");
+        System.out.println("异地库回传接口" + new Date());
         //获取运输订单号
         Object orderNumber = map.get("orderNumber");
         Object receviceOrNot = map.get("receviceOrNot");
@@ -1423,8 +1423,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             omstrainOrder.setIsAcceptTime(receviceTime);
             result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
         }
-
-
         return result;
     }
 

+ 12 - 12
src/main/resources/com/steerinfo/dil/mapper/OmstrainOrderMapper.xml

@@ -14,7 +14,7 @@
     <result column="ENSTATION_TIME" jdbcType="TIMESTAMP" property="enstationTime" />
     <result column="OUTSTATION_TIME" jdbcType="TIMESTAMP" property="outstationTime" />
     <result column="BILLING_WEIGHT" jdbcType="DECIMAL" property="billingWeight" />
-    <result column="IS_ACCEPT " jdbcType="DECIMAL" property="isAccept" />
+    <result column="IS_ACCEPT" jdbcType="DECIMAL" property="isAccept" />
     <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="STRAWMATS" jdbcType="DECIMAL" property="strawmats" />
     <result column="IS_ACCEPT_TIME" jdbcType="TIMESTAMP" property="isAcceptTime" />
@@ -23,12 +23,12 @@
   <sql id="columns">
     ORDER_ID, ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ENSTATION_TIME, OUTSTATION_TIME,
-    BILLING_WEIGHT, "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS, IS_ACCEPT_TIME, ACCEPT_REMARK
+    BILLING_WEIGHT, "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS, IS_ACCEPT_TIME, ACCEPT_REMARK
   </sql>
   <sql id="columns_alias">
     t.ORDER_ID, t.ORDER_NO, t.ORDER_WAGON_NO, t.ORDER_WAGON_WEIGHT, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.ENSTATION_TIME,
-    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT ", t.WAREHOUSE_ID, t.STRAWMATS,
+    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t.IS_ACCEPT, t.WAREHOUSE_ID, t.STRAWMATS,
     t.IS_ACCEPT_TIME, t.ACCEPT_REMARK
   </sql>
   <sql id="select">
@@ -76,7 +76,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -131,7 +131,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -188,7 +188,7 @@
       or BILLING_WEIGHT = #{billingWeight}
     </if>
     <if test="isAccept != null">
-      or IS_ACCEPT  = #{isAccept}
+      or IS_ACCEPT = #{isAccept}
     </if>
     <if test="warehouseId != null">
       or WAREHOUSE_ID = #{warehouseId}
@@ -208,7 +208,7 @@
                                 ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
                                 UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                 ENSTATION_TIME, OUTSTATION_TIME, BILLING_WEIGHT,
-                                "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS,
+                                IS_ACCEPT, WAREHOUSE_ID, STRAWMATS,
                                 IS_ACCEPT_TIME, ACCEPT_REMARK)
     values (#{orderId,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, #{orderWagonNo,jdbcType=VARCHAR},
             #{orderWagonWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
@@ -257,7 +257,7 @@
         BILLING_WEIGHT,
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT ",
+        IS_ACCEPT,
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID,
@@ -339,7 +339,7 @@
         ENSTATION_TIME = #{enstationTime,jdbcType=TIMESTAMP},
         OUTSTATION_TIME = #{outstationTime,jdbcType=TIMESTAMP},
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
         STRAWMATS = #{strawmats,jdbcType=DECIMAL},
         IS_ACCEPT_TIME = #{isAcceptTime,jdbcType=TIMESTAMP},
@@ -383,7 +383,7 @@
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
@@ -420,7 +420,7 @@
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, ENSTATION_TIME,
     OUTSTATION_TIME, BILLING_WEIGHT,
-    "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS,
+    IS_ACCEPT, WAREHOUSE_ID, STRAWMATS,
     IS_ACCEPT_TIME, ACCEPT_REMARK)
     ( <foreach collection="list" item="item" separator="union all">
     select
@@ -485,7 +485,7 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
       when #{item.orderId,jdbcType=DECIMAL} then #{item.billingWeight,jdbcType=DECIMAL}
     </foreach>
-    ,"IS_ACCEPT "=
+    ,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>