tiaj

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

@@ -98,6 +98,6 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     int updateOmsRedQrCode(Map<String, Object> map);
 
-    int checkOrderByFlId(Map<String, Object> map);
+
 
 }

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

@@ -293,8 +293,32 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             amsSaleOrder.setSaleOrderStatus(new BigDecimal(4));
             amsSaleOrder.setDeleted(new BigDecimal(0));
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            BigDecimal saleOrderId = amsSaleOrder.getSaleOrderId();
             // 如果是财务审批后，将不可作业的运输订单改为已接收状态
-            result += amsSaleOrderMapper.updateTruckOrderStatus(amsSaleOrder.getSaleOrderId());
+            //反关闭这个销售订单下面被关闭的运单
+            try {
+                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);
+                    }
+
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             try{
                 new Thread( new Runnable() {
                     public void run(){

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

@@ -760,10 +760,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                      return  true;
                 }
                 //判断该分录是不是在物流系统,如果不在返回true
-                int count = tmstruckWeightResultMapper.checkOrderByFlId(map);
-                if (count == 0) {
-                    return true;
-                }
                 int j = tmstruckWeightResultMapper.checkOrder(map);
                 if (j == 0) {
                     //如果对不上,那么就将运输订单里面的状态变一下

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

@@ -1093,8 +1093,10 @@
     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}
+    WHERE
+    oo.order_status = 7
     and oo.order_type = 1
+    and ASOM.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
 

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

@@ -865,8 +865,15 @@
         WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
     </select>
     <select id="selectOrderMaterialcount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
-        SELECT count(oom.ORDER_MATERIAL_ID) FROM OMSTRUCK_ORDER_MATERIAL OOM
-        WHERE OOM.ORDER_ID = #{orderId}
+        SELECT count(ASM.SALE_MATERIAL_ID) FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        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
+        WHERE OO.ORDER_ID = #{orderId}
+        AND ASM.DELETED is  null
     </select>
     <select id="selectOrderStatus" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
         SELECT oo.ORDER_STATUS FROM OMSTRUCK_ORDER OO

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

@@ -1081,12 +1081,9 @@
     <update id="updateOmsRedQrCode" parameterType="map">
         UPDATE OMSTRUCK_ORDER OO
         SET OO.DELETED = 2,
-            UPDATE_USERNAME = '三方校验物资错误,二维码变红色'
+            oo.UPDATE_USERNAME = '三方校验物资错误,二维码变红色'
         WHERE OO.ORDER_NUMBER = #{orderNumber}
         and OO.ORDER_STATUS = 5
     </update>
-    <select id="checkOrderByFlId" resultType="java.lang.Integer">
-        SELECT count(ASM.SALE_MATERIAL_ID)  FROM AMS_SALE_MATERIAL ASM
-        WHERE ASM.EAS_PRIMARY_ID = #{flId}
-    </select>
+
 </mapper>

src/main/resources/log4j.properties

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