sds

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

@@ -363,15 +363,19 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             //在单价表里内转计时是6
             type = new BigDecimal(6);
         }
-        mapvalue.put("type",type);
-        List<Map<String,Object>> mapList = amsContractTruckPriceService.selectInwardPrice(mapvalue);
+        List<Map<String,Object>> mapList=new LinkedList<>();
+        try{
+            mapvalue.put("type",type);
+             mapList=mapList = amsContractTruckPriceService.selectInwardPrice(mapvalue);
+        }catch (Exception e){
+            System.out.println("e"+e.getMessage());
+        }
         if(mapList.size()!=0){
             return mapList.get(0);
         }
         else{
             return null;
         }
-
     }
 
     @ApiOperation(value = "承运起止范围与装货点")

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

@@ -44,6 +44,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int deleteSpellingList(Object listId);
 
+    //删除排队实绩
+    int deleteQueuingPerformance(BigDecimal resultTotalId);
+
     int deleteQueueList(Object listId);
 
     Map<String, Object> getSteelIsSpelling(BigDecimal orderId);

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

@@ -1215,9 +1215,17 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 
         }else {
             for (Map<String, Object> stringObjectMap : resultList) {
-                BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
-                String address = amsSaleOrderMapper.getshippingAddress(saleShippingAddressId);
-                stringObjectMap.put("saleShippingAddress",address);
+                try {
+                    BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
+                    if (saleShippingAddressId!=null&&!("".equals(saleShippingAddressId))){
+                        String address = amsSaleOrderMapper.getshippingAddress(saleShippingAddressId);
+                        stringObjectMap.put("saleShippingAddress",address);
+                    }
+                }catch (Exception e){
+                    System.out.println("e"+e.getMessage());
+                    stringObjectMap.put("saleShippingAddress","");
+                }
+
             }
         }
         return resultList;
@@ -1902,48 +1910,58 @@ 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 1;
-        }
-        if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
-            String capacityids="";
-            Integer capacityid1= (Integer) mapValue.get("capacityIds");
-            Integer capacityid2= (Integer) mapValue.get("capacityId");
-            if (capacityid1!=null && !("".equals(capacityid1))){
-                capacityids=capacityid1+","+capacityid2;
+        try{
+            //查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
+            BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+            if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
+                return 1;
             }
-            mapValue.put("capacityids",capacityids);
-            //这是修改车牌号
-            //将排队信息删掉
-            Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
-            if(isSpellingMap != null && isSpellingMap.get("listId") != null){
-                int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
-                if(isSpelling == 1){
-                    result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
-                }else{
-                    result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+            if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
+                String capacityids="";
+                Integer capacityid1= (Integer) mapValue.get("capacityIds");
+                Integer capacityid2= (Integer) mapValue.get("capacityId");
+                if (capacityid1!=null && !("".equals(capacityid1))){
+                    capacityids=capacityid1+","+capacityid2;
+                }
+                mapValue.put("capacityids",capacityids);
+                //这是修改车牌号
+                //将排队信息删掉
+                Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+                if(isSpellingMap != null){
+                    int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
+                    if(isSpelling == 1){
+                        result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
+                    }else{
+                        result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+                    }
+                }
+                result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
+                //若是接单之后还需要删除实绩且将状态变为4
+                //查询运输订单的状态和总实绩ID
+                Map<String, Object> orderMesMap = amsSaleOrderMapper.getOrderMes(mapValue);
+                BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMesMap.get("resultTotalId"));
+                //删除排队实绩
+                if (resultTotalId !=null && !("".equals(resultTotalId))){
+                    omstruckOrderMapper.deleteQueuingPerformance(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));
+                    /*omstruckOrder.set*/
+                    result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                    result += omstruckOrderMapper.deleteEnResult(resultTotalId);
+                    result += omstruckOrderMapper.deleteWeightResult(resultTotalId);
+                    result += omstruckOrderMapper.deleteLoadResult(resultTotalId);
+                    result += omstruckOrderMapper.deleteLeaveResult(resultTotalId);
                 }
             }
-            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);
-            }
+        }catch (Exception e){
+            System.out.println("e"+e.getMessage());
         }
         return result;
+
     }
 
     @Override

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

@@ -201,15 +201,20 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
         // 物资中间表
-        BigDecimal materialId = amstruckRequirementMaterialMapper.getMaterialId(mapValue);
-        if (materialId == null){
-            RmsMaterial rmsMaterial = new RmsMaterial();
-            materialId = rmsMaterialMapper.getMaterialId();
-            rmsMaterial.setMaterialId(materialId);
-            rmsMaterial.setMaterialName("钢坯");
-            rmsMaterial.setMaterialSpecification((String)mapValue.get("type"));
-            rmsMaterial.setMaterialModel((String)mapValue.get("model"));
-            rmsMaterialMapper.insertSelective(rmsMaterial);
+        BigDecimal materialId=BigDecimal.ZERO;
+        try {
+            materialId = amstruckRequirementMaterialMapper.getMaterialId(mapValue);
+            if (materialId == null){
+                RmsMaterial rmsMaterial = new RmsMaterial();
+                materialId = rmsMaterialMapper.getMaterialId();
+                rmsMaterial.setMaterialId(materialId);
+                rmsMaterial.setMaterialName("钢坯");
+                rmsMaterial.setMaterialSpecification((String)mapValue.get("type"));
+                rmsMaterial.setMaterialModel((String)mapValue.get("model"));
+                rmsMaterialMapper.insertSelective(rmsMaterial);
+            }
+        }catch (Exception e){
+            System.out.println("e"+e.getMessage());
         }
         AmstruckRequirementMaterial amstruckRequirementMaterial = new AmstruckRequirementMaterial();
         BigDecimal materialNumber = DataChange.dataToBigDecimal(mapValue.get("count"));

src/main/resources/application-prod.yml

@@ -24,5 +24,9 @@ openfeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
  #正式环境端口
 
+mvc:
+  async:
+    request-timeout: 8000
+
 server:
   port: 8079

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

@@ -2733,6 +2733,7 @@
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
         WHERE ASOM.SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId}
+        and rownum =1
   </select>
 
   <select id="getSaleOrderListByCarrierSsoId" resultType="java.util.Map">

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

@@ -900,6 +900,10 @@
         delete from QMS_QUEUE_SPELLING_LIST QQSL
         where QQSL.SPELLING_RESULT_ID = #{listId}
     </delete>
+    <delete id="deleteQueuingPerformance">
+        delete from QMS_QUEUE_RESULT QQR
+        where QQR.RESULT_TOTAL_ID=#{resultTotalId}
+    </delete>
     <delete id="deleteQueueList" >
         delete from QMS_QUEUE_LIST QQL
         where qql.LIST_ID = #{listId}

src/main/resources/log4j.properties

@@ -1,24 +1,24 @@
-## LOG4J配置
-log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
-## 控制台输出
+## LOG4J\u914D\u7F6E
+log4j.rootCategory=INFO,file,RUNNING,errorfile
+## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-## root日志输出到文件
+## root\u65E5\u5FD7\u8F93\u51FA\u5230\u6587\u4EF6
 log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.file.file=/logsdata/logs/springboot-log4j-root.log
 log4j.appender.file.DatePattern='.'yyyy-MM-dd
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-## 按不同package进行输出
-## com.steer包下的日志配置
+## \u6309\u4E0D\u540Cpackage\u8FDB\u884C\u8F93\u51FA
+## com.steer\u5305\u4E0B\u7684\u65E5\u5FD7\u914D\u7F6E
 log4j.category.market=DEBUG, steerfile
 log4j.category.com.hnshituo=DEBUG, steerfile
 #log4j.category.com.steer=${logging.level.com.steer}, steerfile
 log4j.category.com.steer=DEBUG, steerfile
-# com.steer下的日志输出
+# com.steer\u4E0B\u7684\u65E5\u5FD7\u8F93\u51FA
 log4j.appender.steerfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.steerfile.file=/logsdata/logs/springboot-log4j-steer.log
 log4j.appender.steerfile.DatePattern='.'yyyy-MM-dd
@@ -27,9 +27,9 @@ log4j.appender.steerfile.layout=org.apache.log4j.PatternLayout
 log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
 
-## ERROR级别输出到特定的日志文件中
+## ERROR\u7EA7\u522B\u8F93\u51FA\u5230\u7279\u5B9A\u7684\u65E5\u5FD7\u6587\u4EF6\u4E2D
 log4j.logger.error=errorfile
-## 异常日志####
+## \u5F02\u5E38\u65E5\u5FD7####
 log4j.appender.errorfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.errorfile.file=/logs/exception/exc.log
 log4j.appender.errorfile.DatePattern='.'yyyy-MM-dd
@@ -38,7 +38,7 @@ log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
 #log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-### 运行日志 ###
+### \u8FD0\u884C\u65E5\u5FD7 ###
 log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
@@ -47,9 +47,9 @@ log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-### 指定类###
+### \u6307\u5B9A\u7C7B###
 log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
-## 调试日志 ###
+## \u8C03\u8BD5\u65E5\u5FD7 ###
 log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.DEB.File = /logs/debug/debug.log
 log4j.appender.DEB.Append = true
@@ -59,7 +59,7 @@ log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
 log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 ####[%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n
 
-#### 业务日志###
+#### \u4E1A\u52A1\u65E5\u5FD7###
 log4j.logger.com.steer.rbac.sysoperlog.service.BizLogRecord = INFO,BIZ
 log4j.appender.BIZ = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.BIZ.File = /logs/business/biz.log
@@ -70,7 +70,7 @@ log4j.appender.BIZ.layout = org.apache.log4j.PatternLayout
 log4j.appender.BIZ.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 #
 #
-#### 资源日志###
+#### \u8D44\u6E90\u65E5\u5FD7###
 #log4j.appender.ENV = org.apache.log4j.DailyRollingFileAppender
 #log4j.appender.ENV.File = ../logs/env/env.log
 #log4j.appender.ENV.Append = true