Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java
#	src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

pom.xml

@@ -105,14 +105,13 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.63:1521:ORCL</connUrl>
+                    <user>dzgt</user>
+                    <password>bigdata</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_CONTAACT_PRICE_MATERIAL</param>-->
+                        <param>TB_PRODUCT_SUMMARY_DG</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -402,4 +402,18 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         int i = amsContractTruckPriceService.updatePriceByPriceId(map);
         return success(i);
     }
+
+    @ApiOperation(value="查询物资")
+    @PostMapping("/getwz")
+    public RESTfulResult getwz(@RequestBody(required=false) Map<String,Object> map){
+        List<Map<String, Object>> i = amsContractTruckPriceService.getwz(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询联动公式数据")
+    @PostMapping("/getcargonameId")
+    public RESTfulResult getcargonameId(@RequestBody(required=false) Map<String,Object> map){
+        Map<String, Object> i = amsContractTruckPriceService.getcargonameId(map);
+        return success(i);
+    }
 }

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

@@ -11,6 +11,6 @@ import java.util.Map;
 @Mapper
 public interface AmsContaactPriceMaterialMapper extends IBaseMapper<AmsContaactPriceMaterial, BigDecimal> {
     List<Map<String, Object>> getMaterialName(Map<String,Object> map);
-
+    int deletePriceByPriceId(String priceId);
 
 }

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

@@ -61,5 +61,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
 
     List<Map<String, Object>> getRangePoint(Map<String, Object> mapValue);
 
-    int updatePriceByPriceId(Map<String, Object> map);
+    List<Map<String, Object>> selectwz(Map<String, Object> map);
+
+    Map<String, Object> getcargonameId(Map<String, Object> map);
 }

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

@@ -172,4 +172,8 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     //更新
     int updateForTel(BigDecimal saleodermatetialid,String consigneeTel);
 
+    Map<String,Object> getOrderIdByCapacity(Map<String,Object> map);
+
+    Map<String, Object> getOrderMes(Map<String, Object> mapValue);
+
 }

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

@@ -3,11 +3,9 @@ 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;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,4 +28,18 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     List<Map<String, Object>> findMaxPriceId(Map<String, Object> priceMap);
 
     String findCarNumberByOrderId(BigDecimal orderId);
+
+    int deleteWeightResult(BigDecimal resultTotalId);
+
+    //删除装货实绩
+    int deleteLoadResult(BigDecimal resultTotalId);
+
+    //删除出厂实绩
+    int deleteLeaveResult(BigDecimal resultTotalId);
+
+    //删除进厂实绩
+    int deleteEnResult(BigDecimal resultTotalId);
+
+    BigDecimal getOldCapacityId(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/IAmsContractTruckPriceService.java

@@ -63,4 +63,8 @@ public interface IAmsContractTruckPriceService {
     int updatePriceById(Map<String, Object> map);
 
     int updatePriceByPriceId(Map<String, Object> map);
+
+    List<Map<String, Object>> getwz(Map<String, Object> map);
+
+    Map<String, Object> getcargonameId(Map<String, Object> map);
 }

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

@@ -668,8 +668,63 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     }
 
     @Override
-    public int updatePriceByPriceId(Map<String, Object> map){
-        int i = amsContractTruckPriceMapper.updatePriceByPriceId(map);
+    public int updatePriceByPriceId(Map<String, Object> mapValue){
+        int i = 0;
+        BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
+        BigDecimal formulaId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
+        BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
+        Date priceDate = new Date((Long)mapValue.get("priceDate"));
+        BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
+        BigDecimal oilpriceBase = DataChange.dataToBigDecimal(mapValue.get("oilpriceBase"));
+//        BigDecimal oilTypeId = DataChange.dataToBigDecimal(mapValue.get("oilTypeId"));
+        BigDecimal oilpriceChangeThreshold = DataChange.dataToBigDecimal(mapValue.get("oilpriceChangeThreshold"));
+        List<Map<String,Object>>mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        BigDecimal priceId=DataChange.dataToBigDecimal(mapValue.get("priceId"));
+
+        AmsContractTransportPrice amsContractTransportPrice = new AmsContractTransportPrice();
+        amsContractTransportPrice.setOilpriceBase(oilpriceBase);
+//        amsContractTransportPrice.setOilTypeId(oilTypeId);  油品名称
+        amsContractTransportPrice.setPriceValue(priceValue);
+        amsContractTransportPrice.setPriceDate(priceDate);
+        amsContractTransportPrice.setCargonameId(formulaId);
+        amsContractTransportPrice.setPriceId(priceId);
+        amsContractTransportPrice.setUpdateTime(new Date());
+        i =  amsContractTruckPriceMapper.updateByPrimaryKeySelective(amsContractTransportPrice);
+        // 根据priceId先查询之前是否有物资
+//        如果有，但是接受的没有就删除
+        List<Map<String, Object>> selectwz = amsContractTruckPriceMapper.selectwz(mapValue);
+        if (!selectwz.isEmpty() && mapList.isEmpty()){
+            i = amsContaactPriceMaterialMapper.deletePriceByPriceId(mapValue.get("priceId").toString());
+        }
+        //把之前的全删了，然后新增
+        if (mapList!=null && mapList.size()>0) {
+            i = amsContaactPriceMaterialMapper.deletePriceByPriceId(mapValue.get("priceId").toString());
+        }
+        for (Map<String,Object>map:mapList
+        ) {
+            //新增
+            AmsContaactPriceMaterial amsContaactPriceMaterial = new AmsContaactPriceMaterial();
+            //设置最大主键ID
+            amsContaactPriceMaterial.setId(amsContractTruckPriceMapper.selectPriceMaterialMaxId());
+            amsContaactPriceMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+            amsContaactPriceMaterial.setPriceId(amsContractTransportPrice.getPriceId());
+            amsContaactPriceMaterial.setDeleted(new BigDecimal(0));
+            i = amsContaactPriceMaterialMapper.insertSelective(amsContaactPriceMaterial);
+        }
         return i;
     }
+
+    @Override
+    public List<Map<String, Object>> getwz(Map<String, Object> map){
+        List<Map<String, Object>> selectwz = amsContractTruckPriceMapper.selectwz(map);
+        return selectwz;
+    }
+
+    @Override
+    public Map<String, Object> getcargonameId(Map<String, Object> map) {
+        Map<String, Object> value = amsContractTruckPriceMapper.getcargonameId(map);
+        return value;
+    }
+
 }

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

@@ -831,14 +831,15 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
             BigDecimal status;
+            status = new BigDecimal(2);
             // 非钢材（危化品和焦炭）
-            if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
-                status = new BigDecimal(2);
-            }
-            // 钢材
-            else {
-                status = new BigDecimal(1);
-            }
+//            if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4 || isSteel.intValue() == 6)) {
+//                status = new BigDecimal(2);
+//            }
+//            // 钢材
+//            else {
+//                status = new BigDecimal(1);
+//            }
             // 订单类型
             omstruckOrder.setOrderType(status);
             // 运输线路id

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

@@ -817,6 +817,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         for (Map<String,Object> map : mapList) {
             // 得到车牌号
             String capacityNumber = (String) map.get("capacityNumber");
+            Map<String,Object> details = amsSaleOrderMapper.getOrderIdByCapacity(map);
+            if(details!=null && details.get("orderId")!=null){
+                throw new Exception(capacityNumber+"有未完成的运输订单任务，无法派单");
+            }
             // 得到车序号表主键
             BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
             // 得到承运商
@@ -1710,8 +1714,29 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateCapacityNumberInFactory(Map<String, Object> mapValue) {
         Object lineSequence = mapValue.get("lineSequence");
         int result = 0;
+        //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
+        BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+        if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
+            return 0;
+        }
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
+            //这是修改车牌号
             result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
+            //若是接单之后还需要删除实绩且将状态变为4
+            //查询运输订单的状态和总实绩ID
+            Map<String, Object> orderMesMap = amsSaleOrderMapper.getOrderMes(mapValue);
+            BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMesMap.get("resultTotalId"));
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderStatus")).intValue() == 5){
+                OmstruckOrder omstruckOrder = new OmstruckOrder();
+                omstruckOrder.setOrderId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+                omstruckOrder.setOrderStatus(new BigDecimal(4));
+                omstruckOrder.setOrderLineSequence(new BigDecimal(0));
+                result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                result += omstruckOrderMapper.deleteEnResult(resultTotalId);
+                result += omstruckOrderMapper.deleteWeightResult(resultTotalId);
+                result += omstruckOrderMapper.deleteLoadResult(resultTotalId);
+                result += omstruckOrderMapper.deleteLeaveResult(resultTotalId);
+            }
         }
         return result;
     }
@@ -1891,7 +1916,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         head.put("status",status);
         input.put("head",head);
         // 测试
-        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+        Map<String, Object> totalMap = easUtil.getTotalMap();
         // 正式
 //        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
         input.put("head",head);
@@ -1930,7 +1955,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         head.put("status",status);
         input.put("head",head);
         // 测试
-        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+        Map<String, Object> totalMap = easUtil.getTotalMap();
         // 正式
 //        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
         input.put("head",head);

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -199,4 +199,7 @@
     PRICE_ID = #{priceId}
     AND ACPR.DELETED = 0
   </select>
+  <update id="deletePriceByPriceId" parameterType="string">
+    update AMS_CONTAACT_PRICE_MATERIAL set deleted='1' where PRICE_ID=#{priceId}
+  </update>
 </mapper>

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

@@ -1064,7 +1064,27 @@
         </where>
     </select>
 
-  <update id="updatePriceByPriceId" parameterType="java.util.Map">
-    update AMS_CONTRACT_TRANSPORT_PRICE set PRICE_VALUE=#{priceValue} where PRICE_ID=#{priceId}
-  </update>
+  <select id="selectwz" resultType="java.util.Map">
+  select
+      RMT.MATERIAL_TYPE_NAME "materialName",
+      RMT.MATERIAL_TYPE_ID "materialId"
+      from AMS_CONTAACT_PRICE_MATERIAL acpr
+      left join RMS_MATERIAL_TYPE RMT
+      on RMT.MATERIAL_TYPE_ID = acpr.MATERIAL_ID
+      where
+      RMT.MATERIAL_ISINWARD = 1
+      AND
+      PRICE_ID = #{priceId}
+      AND ACPR.DELETED = 0
+  </select>
+
+  <select id="getcargonameId" resultType="java.util.Map">
+    select
+    BF.FORMULA_ID     AS "formulaId",
+    BF.FORMULA_NAME   AS "formulaName",
+    BF.FORMULA_STRING AS "formulaString"
+    from AMS_CONTRACT_TRANSPORT_PRICE t
+    left join BMSTRUCK_FORMULA bf on t.cargoname_id=bf.formula_id
+    where price_id=#{priceId}
+  </select>
 </mapper>

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

@@ -1959,8 +1959,8 @@
     ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
-    and a_s_order.DELETED = 0
     and ASM.DELETED IS NULL
+    and ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -2515,6 +2515,7 @@
     AND OO.ORDER_ID IS NULL
     AND ADSO.DISPATCH_ID IS NOT NULL
     AND ASM.DELETED IS NULL
+    AND ASM.SALE_MATERIAL_ID IS NOT NULL
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC
   </select>
 
@@ -2602,6 +2603,7 @@
     and ADSO.DISPATCH_TYPE = 2
     and OO.ORDER_ID IS NULL
     AND ASM.DELETED IS NULL
+    AND ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = a_s_order.INSERT_TIME
     </if>
@@ -2909,6 +2911,7 @@
     AND ADSO.CARRIER_ID IS NULL
     AND ASO.DELETED = 0
     AND ASM.DELETED IS NULL
+    AND ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
     </if>
@@ -3068,6 +3071,7 @@
     AND OO.ORDER_ID IS NULL
     AND ASO.DELETED = 0
     AND ASM.DELETED IS NULL
+    AND ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
     </if>
@@ -3202,6 +3206,7 @@
            LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
                      ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    and ASM.SALE_MATERIAL_ID IS NOT NULL
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC
   </select>
 
@@ -3378,6 +3383,8 @@
                      ON ASOM.SALE_SHIPPING_ADDRESS_ID = ACTP.PLACE_ID
     WHERE ACTP.CARRIER_ID = #{carrierId}
       AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    ORDER BY ACTP.INSERT_TIME DESC
+    FETCH NEXT 1 ROWS ONLY
   </select>
 
   <select id="selectConsigneeName" parameterType="DECIMAL" resultType="java.lang.String" >
@@ -3441,7 +3448,8 @@
                      ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
            LEFT JOIN RMS_RECEIVE_ADDRESS RRA
                      ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
-    WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+    WHERE asm.SALE_MATERIAL_ID is not null
+    and   ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
   <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.LinkedHashMap" >
@@ -4205,7 +4213,8 @@
   <!-- 修改厂内未装货车辆的运单车牌号 -->
   <update id="updateCapacityNumberInFactory" parameterType="java.util.Map" >
     UPDATE OMSTRUCK_ORDER OO
-    SET OO.CAPACITY_ID = #{capacityId}
+    SET OO.CAPACITY_ID = #{capacityId},
+        OO.insert_update_remark = '修改车牌号'
     WHERE OO.ORDER_ID = #{orderId}
   </update>
   <update id="bindSaleArea">
@@ -4552,6 +4561,27 @@
     SELECT count(RMCP.CARRIER_PLACE_ID) FROM RMS_MORE_CARRIER_PLACE RMCP
     WHERE RMCP.CARRIER_PLACE_VALUE LIKE #{place}
   </select>
+  <select id="getOrderIdByCapacity" resultType="java.util.Map">
+    select OO.order_ID "orderId",
+           RC.CAPACITY_NUMBER "capacityNumber",
+           OO.ORDER_STATUS "orderStatus",
+           OO.ORDER_LINE_SEQUENCE "orderLineSequence"
+    from OMSTRUCK_ORDER OO
+           LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID =RC.CAPACITY_ID
+           LEFT JOIN RMS_CARRIER RCA ON OO.CARRIER_ID=RCA.CARRIER_ID
+           LEFT JOIN OMSTRAIN_ORDER_MATERIAL OOM ON OOM.ORDER_ID=OO.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+    where RC.CAPACITY_NUMBER=#{capacityNumber} and OO.order_status=5
+      fetch next 1 rows only
+  </select>
+  <select id="getOrderMes" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT TTR.RESULT_TOTAL_ID "resultTotalId",
+           OO.ORDER_STATUS "orderStatus"
+           FROM OMSTRUCK_ORDER OO
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON TTR.ORDER_ID = OO.ORDER_ID
+    WHERE OO.ORDER_ID = #{orderId}
+  </select>
 
   <select id="getId" resultType="java.math.BigDecimal">
     select ASOM.SALE_ORDER_MATERIAL_ID "saleodermatetialid"

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

@@ -827,6 +827,7 @@
            LEFT JOIN AMS_SALE_MATERIAL ASM
                      ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+            AND ASM.SALE_MATERIAL_ID IS NOT NULL
   </select>
 
   <update id="updateSendStation">

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

@@ -864,4 +864,30 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getOldCapacityId" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT OO.CAPACITY_ID FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <delete id="deleteWeightResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_WEIGHT_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!-- 删除装车实绩   -->
+    <delete id="deleteLoadResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LOAD_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--  删除出厂实绩-->
+    <delete id="deleteLeaveResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LEAVE_FACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--删除进厂实绩-->
+    <delete id="deleteEnResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_ENFACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
 </mapper>

src/main/resources/log4j.properties

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