处理托书推送单号和ID问题

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -924,7 +924,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  QueryWrapper<SyShippingDetailsItem> itemQueryWrapper = new QueryWrapper<>();
 		  itemQueryWrapper.in("id",idsList).eq("submit_status","0");
 		  List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(itemQueryWrapper);
-		  if(list.size()!=0){
 			  if(syShippingDetails.getType().equals("1")) {
 				  for (SyShippingDetailsItem li : list) {
 //					  if (li.getSubmitStatus() == 1) {
@@ -1006,7 +1005,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }
 				  }
 			  }
-		  }
+
 
 		  int i = syShippingDetailsService.batchSubmission(idsList,syShippingDetails.getType());
 		  if(i>0){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -632,9 +632,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         String cCode = "";
 
         //获取单据号加1
-        cCode= org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSPVCode","SalePayVouch","cSPVCode"));
+        cCode= org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCodeSalePayVouch("cSPVCode","SalePayVouch","cSPVCode"));
         //获取ID
-        id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ID","SalePayVouch","cSPVCode"));
+        id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCodeSalePayVouch("ID","SalePayVouch","cSPVCode"));
         //查询U8汇率
         Map<String, Object> rate = null;
         String nflat = "";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.java

@@ -27,6 +27,9 @@ public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousin
 
     String getMaxCode(@Param("code")String code,@Param("tableName")String tableName,@Param("dDate")String dDate);
 
+    //获取销售费用支出单单据号
+    String getMaxCodeSalePayVouch(@Param("code")String code,@Param("tableName")String tableName,@Param("dDate")String dDate);
+
     /**
      * @Author chenchuang
      * @Description //TODO 采购入库主表新增

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -10,6 +10,10 @@
         select top 1 ${code} from ${tableName} ORDER BY ${dDate} desc
     </select>
 
+    <select id="getMaxCodeSalePayVouch" resultType="java.lang.String">
+        select top 1 ${code} from ${tableName} where cSPVCode like'00%' ORDER BY ${dDate} desc
+    </select>
+
     <insert id="saveRdRecord01One">
         INSERT INTO RdRecord01
         (