采购单、采购退货单列表降序排序，已提交的审批不能删除

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java

@@ -94,9 +94,7 @@ public class PmsPurchaseBillRest {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
+		return pmsPurchaseBillService.delAll(sids);
-		pmsPurchaseBillService.delAll(sids);
-		return rb.success();
 	}
 
 	@ApiOperation("根据SID获取一条记录")

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java

@@ -87,9 +87,7 @@ public class PmsPurchasebackBillRest {
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
+		return pmsPurchasebackBillService.delAll(sids);
-		pmsPurchasebackBillService.delAll(sids);
-		return rb.success();
 	}
 
 	@ApiOperation("根据SID获取一条记录")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java

@@ -63,4 +63,6 @@ public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBil
     int checkNodeStateBySourceBillSid(String sourceBillSid);
 
 	BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
+
+	int selectBySid(String join);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@@ -72,4 +72,11 @@
 		ORDER BY createTime DESC
 				LIMIT 1
 	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM pms_purchaseback_bill
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@@ -140,6 +140,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
+		qw.orderByDesc("ppb.createTime");
 		qw.groupBy("ppb.sid");
 		IPage<PmsPurchasebackBill> page = PagerUtil.queryToPage(pq);
 		IPage<PmsPurchasebackBillVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -225,11 +226,18 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		return vo;
 	}
 
-	public void delAll(String[] sids) {
+	public ResultBean delAll(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+		}
 		delBySids(sids);
 		for (String sid : sids) {
 			pmsPurchasebackDetailService.delByMainSid(sid);
 		}
+		return rb.success();
 	}
 
 	public ResultBean submit(SubmitPmsPurchasebackBillDto dto) {

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java

@@ -61,4 +61,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper<PmsPurchaseBill> {
     String selectNum(String billNo);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    int selectBySid(String join);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@@ -86,4 +86,11 @@
 		</if>
 		WHERE sid=#{sid}
 	</update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM pms_purchase_bill
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -157,6 +157,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("ppb.createTime");
         qw.groupBy("ppb.sid");
         IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
         IPage<PmsPurchaseBillVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -307,13 +308,20 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         return vo;
     }
 
-    public void delAll(String[] sids) {
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             pmsPurchaseBillDetailService.delByMainSid(sid);
             pmsPurchasePayService.delByMainSid(sid);
             pmsPurchaseBillInvoiceService.delByMainSid(sid);
         }
+        return rb.success();
     }
 
     public ResultBean submit(SubmitPmsPurchaseBillDto dto) {