luobang 1 рік тому
батько
коміт
0b7e8ad31a

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java

@@ -20,4 +20,6 @@ public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, Long> {
 
     Map<String,Object> selectSettleMethod(BigDecimal receiveId);
 
+    Integer getConsigneeIdByName(String consigneeCompanyName);
+
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -84,6 +84,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         String consigneeCode = (String) mapVal.get("consigneeCode");
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
+
         // 判断是否EASId已存在
         Map<String,Object> map = new HashMap<>();
         map.put("consigneeCode",consigneeCode);
@@ -138,7 +139,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         }
         int result = 0;
         // 新增
-        if (rmsRmsConsignees.size() == 0) {
+        if (rmsRmsConsignees.size() == 0 ) {
             rmsConsignee.setConsigneeId(consigneeId);
             rmsConsignee.setDeleted(deleted);
             result = rmsConsigneeMapper.insertSelective(rmsConsignee);

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -157,7 +157,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩"  + "---------------------------------");
         try{
             new Thread( new Runnable() {
-                public void run(){
+                public synchronized void run(){
                     try {
                         newFileTool.newFile(jsonObject.toString(),"计量传输物流实绩");
                     } catch (IOException e) {

+ 5 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -699,4 +699,9 @@
     SELECT RC.CONSIGNEE_SETTLEMENT_METHOD "settleMethod", RC.CONSIGNEE_SSO_ID "userId" FROM RMS_CONSIGNEE RC
     WHERE RC.CONSIGNEE_ID = #{receiveId}
   </select>
+  <select id="getConsigneeIdByName" resultType="java.lang.Integer" parameterType="string">
+      SELECT COUNT(RC.CONSIGNEE_ID) FROM RMS_CONSIGNEE RC
+      WHERE RC.DELETED = 0
+      AND   RC.CONSIGNEE_COMPANY_NAME =  #{consigneeCompanyName}
+  </select>
 </mapper>

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1089,6 +1089,9 @@
         <if test="orderMaterialId != null">
             and OOM.ORDER_MATERIAL_ID = #{orderMaterialId}
         </if>
+        <if test="saleMaterialId != null">
+            and OOM.SALE_MATERIAL_ID = #{saleMaterialId}
+        </if>
     </update>
     <update id="updateSaleMaterialId">
         update AMS_SALE_MATERIAL

+ 1 - 1
src/main/resources/log4j.properties

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