轮胎商城：1.收款结算获取应结算数据增加共享单据

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -974,7 +974,8 @@ public class OrderController extends BladeController {
 		if ("d".equals(order.getSettlementType())) {
 //		if ("XS,TKXS".equals(order.getBsType())) {
 			lambdaQueryWrapper.apply("(( bs_type = 'XS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND total_money != payment_amount_tl)" +
-				" OR ( bs_type = 'TKXS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND total_money != payment_amount_tl))");
+				" OR ( bs_type = 'TKXS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND total_money != payment_amount_tl)" +
+				" OR ( bs_type = 'GX' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND status = '已发货' AND total_money != payment_amount_tl))");
 			/*lambdaQueryWrapper.eq(PjOrder::getGenerateTask, "已生成")
 				.apply("find_in_set(actual_payment_status,'1,3')");*/
 		} else if ("c".equals(order.getSettlementType())) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4115,6 +4115,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			pjOrder.setGoodsTotalShipNum(sendNum);
 			pjOrder.setGoodsTotalShipAmount(goodsTotalShipAmount);
 			if (goodsNum.compareTo(sendNum) == 0) {
+				pjOrder.setGenerateTask("已生成");
 				pjOrder.setStatus("已发货");
 				pjOrder.setXcxStatus("已发货");
 				pjOrder.setOriginalStatus("已发货");
@@ -4454,15 +4455,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			order.setGoodsTotalShipNum(sendNum);
 			order.setGoodsTotalShipAmount(goodsTotalShipAmount);
 			if (sendNum.compareTo(new BigDecimal("0.00")) == 0) {
+				order.setGenerateTask("未生成");
 				order.setStatus("待确认");
 				order.setXcxStatus("待发货");
 				order.setOriginalStatus("");
 			} else {
 				if (goodsNum.compareTo(sendNum) == 0) {
+					order.setGenerateTask("未生成");
 					order.setStatus("待确认");
 					order.setXcxStatus("待发货");
 					order.setOriginalStatus("");
 				} else {
+					order.setGenerateTask("未生成");
 					order.setStatus("部分派发");
 				}
 			}