|
@@ -12,6 +12,7 @@ import com.steerinfo.dil.service.IOmstruckOrderService;
|
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
import com.steerinfo.dil.util.EASCapacityTestUtil;
|
|
|
import io.swagger.models.auth.In;
|
|
|
+import org.junit.Test;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -584,7 +585,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(8));
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD HH:mm:ss");
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
String dateStr = sdf.format(new Date());
|
|
|
omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除," + "撤销时间:" + dateStr + "撤销时路段顺序号为:" + mesMap.get("lineSqe"));
|
|
|
//讲路段顺序号设为空,适应进厂以后扫码
|
|
@@ -638,6 +639,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
System.out.println(map.get("capacityNumber") + "司机撤销订单将订单删除" + "撤销时间:" + dateStr + "撤销订单号为:" + orderId);
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public static void main(String[] args) {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ System.out.println(new Date());
|
|
|
+ String dateStr = sdf.format(new Date());
|
|
|
+ System.out.println(dateStr);
|
|
|
+ }
|
|
|
//修改运力
|
|
|
@Override
|
|
|
public int updateCapacityId(Map<String,Object> map) {
|