|
@@ -1,6 +1,7 @@
|
|
package com.steerinfo.dil.controller;
|
|
package com.steerinfo.dil.controller;
|
|
|
|
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
|
|
+import com.steerinfo.dil.feign.BmstruckFeign;
|
|
import com.steerinfo.dil.feign.ColumnDataFeign;
|
|
import com.steerinfo.dil.feign.ColumnDataFeign;
|
|
import com.steerinfo.dil.feign.ESFeign;
|
|
import com.steerinfo.dil.feign.ESFeign;
|
|
import com.steerinfo.dil.feign.JoinFeign;
|
|
import com.steerinfo.dil.feign.JoinFeign;
|
|
@@ -18,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -74,6 +74,8 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
|
|
EASCapacityTestUtil easCapacityTestUtil;
|
|
EASCapacityTestUtil easCapacityTestUtil;
|
|
@Autowired
|
|
@Autowired
|
|
EasFluMakeDateUtil easFluMakeDateUtil;
|
|
EasFluMakeDateUtil easFluMakeDateUtil;
|
|
|
|
+ @Autowired
|
|
|
|
+ BmstruckFeign bmstruckFeign;
|
|
|
|
|
|
|
|
|
|
private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
@@ -1490,6 +1492,12 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
|
|
BigDecimal orderId = amsSaleOrderService.selectTransPortOrder(closeWlEntryId);
|
|
BigDecimal orderId = amsSaleOrderService.selectTransPortOrder(closeWlEntryId);
|
|
if (orderId != null) {
|
|
if (orderId != null) {
|
|
amsSaleOrderService.updateTransportOrderStatus(orderId);
|
|
amsSaleOrderService.updateTransportOrderStatus(orderId);
|
|
|
|
+ //看该分录有没有磅重,如果有磅重,有没有计费详单
|
|
|
|
+ BigDecimal detailsOrder = amsSaleOrderMaterialService.getDeatailsOrder(closeWlEntryId);
|
|
|
|
+ if(detailsOrder == null) {
|
|
|
|
+ //如果没有结算数据,则生成结算数据
|
|
|
|
+ bmstruckFeign.addDetailsOrder(orderId);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|