修改

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

@@ -610,11 +610,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 备注
         String saleRemark = (String) mapValue.get("saleRemark");
         String saleGroupCode = null;
-        try {
-            saleGroupCode = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
-        } catch (Exception e) {
-            e.printStackTrace();
+        Object splitStr = StringUtils.substringBetween(saleRemark,"钢材","组");
+        if(splitStr == null || "".equals(splitStr)) {
+            throw new Exception("您输入的摘要格式不正确,请检查后再导入!!,例:钢材某某组");
         }
+        saleGroupCode = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
         // 收款客户
         String saleOrderReceiveCustomer = (String) mapValue.get("saleOrderReceiveCustomer");
         // 业务员

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

@@ -4904,9 +4904,10 @@
       ON TTR.ORDER_ID = TTR.ORDER_ID
       LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
       ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-      AND ASM.MATERIAL_ID = TWR.MATERIAL_ID
+      AND ASM.SALE_MATERIAL_ID = TWR.SALE_MATERIAL_ID
       where NVL(ASM.DELETED,0) = 0
       AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+      AND TWR.RESULT_GROSS_WEIGHT_TIME IS NOT NULL
       AND ASM.EAS_PRIMARY_ID IS NOT NULL
       AND OO.ORDER_TYPE = 1
       AND OO.ORDER_STATUS IN (2,5)
@@ -4916,8 +4917,8 @@
       </foreach>
       </if>
       <if test="easPrimaryList == null">
-         and ASM.SALE_MAKE_DATE IS NULL
-         ORDER BY OO.ORDER_ID
+         and twr.RESULT_GROSS_WEIGHT_TIME + 2 > sysdate
+         ORDER BY twr.RESULT_GROSS_WEIGHT_TIME desc
          FETCH NEXT 50000 ROWS ONLY
       </if>
     </select>