tijiao

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -1299,7 +1299,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
     public RESTfulResult canCapacityEnfactory(@RequestBody Map<String,Object> mapValue) {
         String result = omstruckOrderMapper.canCapacityEnfactory(mapValue);
         Integer orderType = (Integer) mapValue.get("orderType");
-        if (orderType != 1 && orderType != 4) {
+        if (orderType != 1) {
             return success("OK");
         }
         else {

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -77,7 +77,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         if (orderId.intValue() != 0) {
             result = omstruckOrderSeparateService.getOrderResult(orderId);
         }
-        else {
+        else if(orderNumber != null) {
             result = omstruckOrderSeparateService.getOrderNumberResult(orderNumber);
         }
         return result;

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

@@ -4060,6 +4060,7 @@
     </select>
 
     <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
+        SELECT * FROM (
         SELECT
         TER.INSERT_UPDATE_REMARK AS "isOk"
         FROM OMSTRUCK_ORDER OO
@@ -4074,7 +4075,8 @@
             <if test="orderNumber != null">
                 AND OO.ORDER_NUMBER = #{orderNumber}
             </if>
-        </where>
+        </where>)
+        WHERE ROWNUM = 1
     </select>
 
     <select id="getWarehouseMes" parameterType="java.util.Map" resultType="java.util.Map" >