|
@@ -997,7 +997,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
long min = time / (1000 * 60);
|
|
long min = time / (1000 * 60);
|
|
omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
|
|
omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
|
|
try {
|
|
try {
|
|
- if (orderType == 1) {
|
|
|
|
|
|
+ if (orderType == 1 && "true".equals(omstruckOrderMapper.getFactoryFlag())) {
|
|
//如果是钢材订单,判断两天有没有进厂
|
|
//如果是钢材订单,判断两天有没有进厂
|
|
Date enFactoryTime = omstruckOrderMapper.selectCapacityTimesTwoDay((String) map.get("capacityNumber"));
|
|
Date enFactoryTime = omstruckOrderMapper.selectCapacityTimesTwoDay((String) map.get("capacityNumber"));
|
|
if (enFactoryTime != null) {
|
|
if (enFactoryTime != null) {
|