修改

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

@@ -940,6 +940,11 @@ public class StatisticalReportController extends BaseRESTfulController {
             map.put("consigneeNames","%" + consigneeName + "%");
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            //如果业务员登录进来,就去查询业务员所关联的片区
+            List<String> saleAreaRemark = statisticalReportService.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                map.put("saleAreaRemark",saleAreaRemark);
+            }
             map.put("salers",saler);
         }
         if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
@@ -966,21 +971,6 @@ public class StatisticalReportController extends BaseRESTfulController {
                 }
             }*/
             //确认是否有多个收货单位
-            if (shippingAddressIds !=null && !("".equals(shippingAddressIds))){
-                String[] split = shippingAddressIds.split(",");
-                String address="";
-                int i=0;
-                for (String s : split) {
-                    i++;
-                    String getaddress = statisticalReportService.getaddress(DataChange.dataToBigDecimal(s));
-                    if (i==1){
-                        address+="旧地址:"+getaddress+",";
-                    }else if (i==2){
-                        address+="新地址:"+getaddress;
-                    }
-                }
-                stringObjectMap.put("addressPlace",address);
-            }
             //确认是否有多个车牌号
             if (capacityNumbers!=null &&!("".equals(capacityNumbers))){
                 String[] split = capacityNumbers.split(",");
@@ -1059,6 +1049,11 @@ public class StatisticalReportController extends BaseRESTfulController {
             map.put("consigneeNames","%" + consigneeName + "%");
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            //如果业务员登录进来,就去查询业务员所关联的片区
+            List<String> saleAreaRemark = statisticalReportService.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                map.put("saleAreaRemark",saleAreaRemark);
+            }
             map.put("salers",saler);
         }
         if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
@@ -1070,21 +1065,6 @@ public class StatisticalReportController extends BaseRESTfulController {
             String shippingAddressIds = (String) stringObjectMap.get("shippingAddressIds");
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
             //确认是否有多个收货单位
-            if (shippingAddressIds !=null && !("".equals(shippingAddressIds))){
-                String[] split = shippingAddressIds.split(",");
-                String address="";
-                int i=0;
-                for (String s : split) {
-                    i++;
-                    String getaddress = statisticalReportService.getaddress(DataChange.dataToBigDecimal(s));
-                    if (i==1){
-                        address+="旧地址:"+getaddress+",";
-                    }else if (i==2){
-                        address+="新地址:"+getaddress;
-                    }
-                }
-                stringObjectMap.put("addressPlace",address);
-            }
             //确认是否有多个车牌号
             if (capacityNumbers!=null &&!("".equals(capacityNumbers))){
                 String[] split = capacityNumbers.split(",");

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

@@ -166,4 +166,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     String getSaleRemark(BigDecimal saleMaterialId);
 
+    int updateOrderStatus(BigDecimal orderId);
+
 }

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

@@ -242,7 +242,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //判断当前订单是否可出厂
                 Integer canWork = tmstruckLeaveFactoryResultMapper.getCanWorkStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
                 if (allNetWeight + nowNetWeight > saleWeight && canWork == null) {
-                    throw new Exception("该销售订单吨位已超额，不允许出厂，请提醒司机走流程卸货！");
+                    throw new Exception("1");
                 }
             }
         }
@@ -691,7 +691,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         Calendar calendar=Calendar.getInstance();
         calendar.setTime(date);
         //非钢材，出净重24h后自动出厂，并关单
-        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        calendar.add(Calendar.HOUR_OF_DAY,-12);
         date=calendar.getTime();
         Map<String,Object> map = new HashMap<>();
         map.put("nowDate",date);
@@ -708,9 +708,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }
         for(Map<String,Object> item:list){
             try{
+                System.out.println(item);
                 leaveFactoryByPDA(item);
             }catch (Exception e){
                 e.printStackTrace();
+                tmstruckLeaveFactoryResultMapper.updateOrderStatus(DataChange.dataToBigDecimal(item.get("orderId")));
             }
         }
     }

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

@@ -1539,7 +1539,7 @@
                  LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID
                  LEFT JOIN OMSTRUCK_ORDER OO ON OO .ORDER_ID = TTR .ORDER_ID
                  LEFT JOIN RMS_GATEPOST RG ON RG .GATEPOST_NAME = '系统自动补扫出厂'
-        WHERE OO .ORDER_STATUS = 5 AND OO .ORDER_TYPE != 1 AND TWR .RESULT_NET_WEIGHT IS NULL
+        WHERE OO .ORDER_STATUS = 5 AND OO .ORDER_TYPE != 1 AND TWR .RESULT_NET_WEIGHT IS NOT NULL
         AND TLFR .RESULT_OUT_GATE_TIME IS  NULL
         AND #{nowDate} > TWR .RESULT_GROSS_WEIGHT_TIME
         AND #{nowDate} > TWR .RESULT_TARE_WEIGHT_TIME
@@ -1580,6 +1580,7 @@
             TTR.OUTFACTORY_TIME = sysdate
         where TTR.RESULT_TOTAL_ID = #{resultTotalId}
     </update>
+
     <select id="getSaleRemark" resultType="java.lang.String" parameterType="decimal">
         SELECT
         (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL
@@ -1591,4 +1592,10 @@
         WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
         fetch first 1 row only
     </select>
+    <update id="updateOrderStatus">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 2,
+            OO.INSERT_UPDATE_REMARK = '自动补扫出厂失败,自动完成订单'
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
 </mapper>

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

@@ -983,7 +983,7 @@
            LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP .PLAN_ID = OO .ORDER_PLAN_ID
            LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON ARP.PLAN_ID = AIP.PLAN_ID
            LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-    WHERE (AIR.INSERT_UPDATE_REMARK like '%计时且过计量%' OR OO .ORDER_TYPE=21)
+    WHERE (AIR.INSERT_UPDATE_REMARK like '%计时且过计量%' OR OO .ORDER_TYPE in (21,26))
       AND OO .ORDER_ID = #{orderId}
   </select>
 </mapper>