采购内转新增二焦化

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

@@ -742,6 +742,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId"));
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
         BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
+        if(orderType.intValue() == 500){
+            orderType = new BigDecimal(16);
+            lineId = new BigDecimal(500);
+        }
         String orgCode =(String) mapValue.get("orgCode");
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
@@ -966,8 +970,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 //判断是否为化专线厂区内转
                 Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);
                 String rangeValue = (String) inwardLine.get("rangeValue");
+                BigDecimal lineId = DataChange.dataToBigDecimal(inwardLine.get("rangeId"));
                 boolean factoryFlag = inwardLine.get("factoryFlag") != null && Long.parseLong(inwardLine.get("factoryFlag").toString()) > 0;
-                if (rangeValue!=null&&(rangeValue.contains(judgeInwardFactory) || rangeValue.contains("化工园区专用线") || factoryFlag)) {
+                if (rangeValue!=null&&(rangeValue.contains(judgeInwardFactory) || rangeValue.contains("化工园区专用线") || factoryFlag || lineId.intValue() == 500)) {
                     //设置进厂厂区为达兴能源
                      orderMessage.put("factory",2);
                 }else {

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

@@ -4268,7 +4268,7 @@
 
    <!-- 判断是否为达钢厂区内转-->
     <select id="isInwardLine" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-     select RTR.TRANS_RANGE_VALUE "rangeValue", RTR.TRANS_RANGE_END_ID "factoryFlag"
+     select RTR.TRANS_RANGE_VALUE "rangeValue", RTR.TRANS_RANGE_END_ID "factoryFlag", OO.line_id "lineId"
       from OMSTRUCK_ORDER OO
      LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
      ON OO.ORDER_PLAN_ID =AIP.PLAN_ID