tijiao

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

@@ -55,4 +55,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String,Object>> selectPreviousOrderNumber(BigDecimal saleOrderId);
 
     Map<String,Object> selectOrderDetails(Map<String,Object> map);
+
+    List<Map<String, Object>> selectOrderList(BigDecimal saleOrderId);
+
 }

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

@@ -198,6 +198,26 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
             // 反关闭销售订单下的所有分录
             result += amsSaleMaterialMapper.openAllSaleMaterial(saleOrderId);
+            //反关闭这个销售订单下面被关闭的运单
+            List<Map<String,Object>> orderMapList = amsSaleOrderMapper.selectOrderList(saleOrderId);
+            for (Map<String,Object> orderMap :orderMapList) {
+                OmstruckOrder omstruckOrder = new OmstruckOrder();
+                if(orderMap.get("factoryResultId") != null) {
+                    omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderMap.get("orderId")));
+                    omstruckOrder.setInsertUpdateRemark("金蝶反关闭整单,物流同步反关闭销售订单下的整单");
+                    omstruckOrder.setOrderStatus(new BigDecimal(5));
+                    omstruckOrder.setUpdateTime(new Date());
+                    omstruckOrder.setUpdateUsername("金蝶");
+                    result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                }else{
+                    omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderMap.get("orderId")));
+                    omstruckOrder.setInsertUpdateRemark("金蝶反关闭整单,物流同步反关闭销售订单下的整单");
+                    omstruckOrder.setOrderStatus(new BigDecimal(4));
+                    omstruckOrder.setUpdateUsername("金蝶");
+                    result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                }
+
+            }
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
         }
         // 反关闭单个分录订单

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

@@ -1084,6 +1084,18 @@
     ORDER BY OO.ORDER_ID
       FETCH NEXT 1 ROWS ONLY
   </select>
+  <select id="selectOrderList" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    SELECT oo.ORDER_ID "orderId", TER.RESULT_ID "factoryResultId" FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+    ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON TTR.ORDER_ID = OO.ORDER_ID
+    LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+    ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+    and oo.order_type = 1
+    and oo.insert_update_remark = '金蝶关闭销售订单,物流同步关闭'
+  </select>
 
 
 </mapper>

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

@@ -833,23 +833,28 @@
     </select>
     <select id="finCarAndCarrierAndEntries" resultType="java.util.Map" parameterType="decimal">
         SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum",
-                        RCE.CARRIER_ABBREVIATION AS "forwarder",
-                        ASM.EAS_PRIMARY_ID AS "entryId"
-        FROM AMS_SALE_ORDER_MATERIAL ASOM
-        LEFT JOIN OMSTRUCK_ORDER OO
-        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
-        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-        LEFT JOIN AMS_SALE_MATERIAL ASM
-        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_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
+               (case when ASO.SALE_ORDER_ISSELF_MENTION = '是'
+               then '自提'
+               else RCE.CARRIER_ABBREVIATION
+               end) "forwarder",
+                ASM.EAS_PRIMARY_ID AS "entryId"
+                FROM AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_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
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
           AND OO.ORDER_TYPE = 1
-        and ASM.SALE_MATERIAL_ID IS NOT NULL
+          and ASM.SALE_MATERIAL_ID IS NOT NULL
     </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout