luobang 2 years ago
parent
commit
3ee563c081

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/WSFaceController.java

@@ -145,7 +145,7 @@ public class WSFaceController extends BaseRESTfulController {
         //DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 0);
         //DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
         //service.setServername("172.16.62.243" , "8888");
-        //
+
         //WSContext wsContext = LoginTestUtil.doEASLogin(service);
         String sessionId = wsContext.getSessionId();
         Map<String , Object> resultMap = new HashMap<>();

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -38,6 +38,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> selecrCloseEntryMes(BigDecimal saleMaterialId);
 
-    List<BigDecimal> selectOrderInfo(@Param("orderNumber") String orderNumber, @Param("wagonNo") String wagonNo);
+    List<BigDecimal> selectOrderInfo(@Param("orderNumber") String orderNumber);
 
 }

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1031,7 +1031,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Object transportType = map.get("transportType");
         Object wagonNo = map.get("wagonNo");
         if(transportType != null && transportType.equals("汽运")) {
-            List<BigDecimal> orderIds = omstruckOrderMapper.selectOrderInfo((String) orderNumber,(String) wagonNo );
+            List<BigDecimal> orderIds = omstruckOrderMapper.selectOrderInfo((String) orderNumber);
             if(orderIds.size() == 0) {
                 throw new Exception("提示回传车皮号与运输订单号不匹配");
             }

+ 1 - 4
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -989,9 +989,6 @@
     </select>
     <select id="selectOrderInfo" resultType="java.math.BigDecimal" >
         SELECT DISTINCT  OO.ORDER_ID FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE RC.CAPACITY_NUMBER = #{wagonNo}
-        AND OO.ORDER_NUMBER = #{orderNumber}
+        WHERE  OO.ORDER_NUMBER = #{orderNumber}
     </select>
 </mapper>