luobang 2 years ago
parent
commit
75afe4998c

+ 4 - 0
src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -487,5 +487,9 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe, resultNetWeight));
     }
 
+    @PostMapping("testJarSuccess")
+    public RESTfulResult testJarSuccess() {
+        return success("jar包发布成功");
+    }
 
 }

+ 8 - 7
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -443,14 +443,15 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         omstruckOrder.setOrderNumber(orderNumber);
         omstruckOrder.setLineId(new BigDecimal(lineId));
         omstruckOrder.setOrderIssueTime(new Date());
-        // 如果线路类型为3或者4(危化品和焦炭)则为非钢材
-        if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
-            omstruckOrder.setOrderType(new BigDecimal(2));
-        }
+        //// 如果线路类型为3或者4(危化品和焦炭)则为非钢材
+        //if (isSteel != null && (isSteel.intValue() == 3 || isSteel.intValue() == 4)) {
+        //
+        //}
+        omstruckOrder.setOrderType(new BigDecimal(2));
         // 否则为钢材
-        else {
-            omstruckOrder.setOrderType(new BigDecimal(1));
-        }
+        //else {
+        //    omstruckOrder.setOrderType(new BigDecimal(1));
+        //}
         omstruckOrder.setOrderStatus(new BigDecimal(4));
         omstruckOrder.setInsertTime(new Date());
         omstruckOrder.setUpdateTime(new Date());