@@ -407,4 +407,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
int updateEnFactoryResultRemark(BigDecimal resultTotalId);
+ String getFactoryFlag();
+
}
@@ -997,7 +997,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
long min = time / (1000 * 60);
omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
try {
- if (orderType == 1) {
+ if (orderType == 1 && "true".equals(omstruckOrderMapper.getFactoryFlag())) {
//如果是钢材订单,判断两天有没有进厂
Date enFactoryTime = omstruckOrderMapper.selectCapacityTimesTwoDay((String) map.get("capacityNumber"));
if (enFactoryTime != null) {
@@ -4540,4 +4540,8 @@
SET TER.INSERT_UPDATE_REMARK = 'OK'
WHERE TER.RESULT_TOTAL_ID = #{resultTotalId}
</update>
+ <select id="getFactoryFlag" resultType="java.lang.String">
+ SELECT DV.VERSION_VALUE FROM DIL_VERSION DV
+ WHERE DV.VERSION_ID = 9
+ </select>
</mapper>