tijiao

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

@@ -164,16 +164,16 @@ public class WSFaceController extends BaseRESTfulController {
     public Map<String,Object> pushCarNumberToEas(@RequestBody Map<String,Object> map) {
 //        Map<String, Object> totalMap = saleUtil.getTotalMap();
 //        totalMap.put("input",map);
-        //正式服务器
+//        正式服务器
         com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
         WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
         service.setServername("172.16.33.111" , "8888");
         //WSContext wsContext = LoginUtil.doEASLogin(service);
         //测试服务器
-//        DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 0);
-//        DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
-//        //测试服务器
-//        service.setServername("172.16.62.243" , "8888");
+        //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();
         String output = null;

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -32,4 +32,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String,Object>> getWareHouse(BigDecimal saleOrderId);
     // 将不可作业的运输订单改为已接收状态
     int updateTruckOrderStatus(BigDecimal saleOrderId);
+
+    String getWithdrawal(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -400,6 +400,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public Map<String,Object> findCarNumberByOrderId(BigDecimal saleOrderMaterialId) {
         Map<String, Object> head = omstruckOrderMapper.findCarNumberByOrderId(saleOrderMaterialId);
+        //根据车序号表查询销售订单表是否自提
+        String isWithdrawal = amsSaleOrderMapper.getWithdrawal(saleOrderMaterialId);
+        if("是".equals(isWithdrawal)){
+            head.replace("forwarder","自提");
+        }
         List<Map<String,Object>> entries = omstruckOrderMapper.findEntriesByOrderId(saleOrderMaterialId);
         Map<String,Object> input = new HashMap<>();
         input.put("entries",entries);

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

@@ -735,8 +735,14 @@
     WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
     AND ASM.SALE_WAREHOUSE IS NOT NULL
   </select>
+    <select id="getWithdrawal" resultType="java.lang.String" parameterType="DECIMAL">
+      SELECT ASO.SALE_ORDER_ISSELF_MENTION FROM AMS_SALE_ORDER_MATERIAL ASOM
+      LEFT JOIN AMS_SALE_ORDER ASO
+      ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+      WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
 
-  <update id="updateTruckOrderStatus" parameterType="DECIMAL">
+    <update id="updateTruckOrderStatus" parameterType="DECIMAL">
     UPDATE OMSTRUCK_ORDER OO
     SET OO.CAN_WORK = 0
     WHERE OO.ORDER_ID IN (

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

@@ -807,10 +807,15 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
     <select id="findCarNumberByOrderId" parameterType="DECIMAL" resultType="java.util.Map" >
-        SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum"
+        SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum",
+                        RCE.CARRIER_NAME AS "forwarder"
         FROM AMS_SALE_ORDER_MATERIAL ASOM
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CARRIER RCE
+                            ON RCE.CARRIER_ID = ADSO.CARRIER_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}