xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取土场结算时sale_type为3；按客户年统计不统计原材料运输的

dev
wany 2025-03-11 14:46:26 +08:00
parent 5f7aa01ab2
commit 4c3952e6a4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -2051,7 +2051,7 @@ public class OrderStatService {
" LEFT JOIN product p ON p.id = t.product_id " + " LEFT JOIN product p ON p.id = t.product_id " +
" left join customer c on c.id = t.customer_id\n" + " left join customer c on c.id = t.customer_id\n" +
// " where t.state = 5\n" + // " where t.state = 5\n" +
" where 1 = 1\n" + " where 1 = 1 and t.sale_type != 3 \n" +
saleParams + saleParams +
// " and t.create_time like ? \n"; // " and t.create_time like ? \n";
// " and t.create_time between ? and ? \n"; // " and t.create_time between ? and ? \n";
@ -2088,7 +2088,7 @@ public class OrderStatService {
" from order_end t\n" + " from order_end t\n" +
" left join customer c on c.id = t.customer_id\n" + " left join customer c on c.id = t.customer_id\n" +
// " where t.state = 5\n" + // " where t.state = 5\n" +
" where 1 = 1\n" + " where 1 = 1 and t.sale_type != 3 \n" +
saleParams + saleParams +
// " and t.create_time like ? \n"; // " and t.create_time like ? \n";
// " and t.create_time between ? and ? \n"; // " and t.create_time between ? and ? \n";
@ -2129,7 +2129,7 @@ public class OrderStatService {
" LEFT JOIN product p ON p.id = t.product_id " + " LEFT JOIN product p ON p.id = t.product_id " +
" left join customer c on c.id = t.customer_id\n" + " left join customer c on c.id = t.customer_id\n" +
// " where t.state = 5\n" + // " where t.state = 5\n" +
" where 1 = 1\n" + saleParams; " where 1 = 1 and t.sale_type != 3 \n" + saleParams;
if (customer_id != null) { if (customer_id != null) {
sql += " and c.id = ? \n"; sql += " and c.id = ? \n";
@ -2160,7 +2160,7 @@ public class OrderStatService {
" from order_end t\n" + " from order_end t\n" +
" left join customer c on c.id = t.customer_id\n" + " left join customer c on c.id = t.customer_id\n" +
// " where t.state = 5\n" + // " where t.state = 5\n" +
" where 1 = 1\n" + saleParams; " where 1 = 1 and t.sale_type != 3 \n" + saleParams;
if (customer_id != null) { if (customer_id != null) {
sql += " and c.id = ? \n"; sql += " and c.id = ? \n";

1
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
View File

@ -493,6 +493,7 @@ public class OrderTempSyncService {
order.setSettlementUserId(sysuser.getId()); order.setSettlementUserId(sysuser.getId());
order.setSettlementUserName(sysuser.getName()); order.setSettlementUserName(sysuser.getName());
order.setSaleType(ordercluster.getSaleType());
order.setState(OrderStateEnum.RECEIVED.getStateid()); // 直接完成，没有前面的过程 order.setState(OrderStateEnum.RECEIVED.getStateid()); // 直接完成，没有前面的过程
order.setCreateTime(now); order.setCreateTime(now);
order.setMemo(memo); // 备注 order.setMemo(memo); // 备注