From ecf2bb8a73dad2727379b18c15f3bf0f4a84bfd8 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 14 Sep 2020 23:58:37 +0800 Subject: [PATCH] . --- .../ssjygl/invoice/receive/InvoiceReceiveService.java | 2 +- .../ssjygl/order/ordercluster/OrderclusterService.java | 9 +++++++++ .../cowr/ssjygl/order/ordertemp/OrderTempService.java | 6 ++++++ .../local/ssjygl/invoice/log/InvoiceLogSyncService.java | 2 +- .../ssjygl/invoice/receive/InvoiceReceiveController.java | 2 +- .../order/ordercluster/OrderclusterController.java | 9 ++++++--- .../ssjygl/order/ordertemp/OrderTempController.java | 9 +++++---- .../ssjygl/order/ordertemp/OrderTempSyncService.java | 8 ++++---- .../ssjygl/invoice/receive/InvoiceReceiveController.java | 2 +- .../order/ordercluster/OrderclusterController.java | 9 ++++++--- .../order/ordercluster/OrderclusterSyncService.java | 6 +++--- .../ordercluster/truck/OrderclusterTruckSyncService.java | 3 ++- .../ssjygl/order/ordertemp/OrderTempController.java | 3 ++- 13 files changed, 47 insertions(+), 23 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java index 0fd68ec..bf848a9 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java @@ -39,7 +39,7 @@ public class InvoiceReceiveService extends BaseService { public String nextInvoice(InvoiceReceive receive) { if (receive == null) { - log.debug("没有有效的领用记录"); + log.debug("没有有效的发票领用记录"); return null; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 25a5277..0c2b4f2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -456,6 +456,7 @@ public class OrderclusterService extends BaseService { String etm, Integer isprepaid, Integer state, + String invoice_code, Integer product_id ) { String salesql = "select \n" + @@ -510,6 +511,14 @@ public class OrderclusterService extends BaseService { tempPara.add("%" + truck_license + "%"); } + if (StrKit.notBlank(invoice_code)) { + salesql += " and t.invoice_code like ? \n"; + tempsql += " and t.invoice_code like ? \n"; + + salePara.add("%" + invoice_code + "%"); + tempPara.add("%" + invoice_code + "%"); + } + if (StrKit.notBlank(stm)) { salesql += " and t.create_time >= ? \n"; tempsql += " and t.create_time >= ? \n"; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 2513acf..b9ce2c1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -69,6 +69,7 @@ public class OrderTempService extends BaseService { String etm, Integer isprepaid, Integer state, + String invoice_code, Integer product_id ) { String selectsql = "select t.* " + @@ -128,6 +129,11 @@ public class OrderTempService extends BaseService { paraList.add(product_id); } + if (StrKit.notBlank(invoice_code)) { + fromsql += " and t.invoice_code like ? \n"; + paraList.add("%" + invoice_code + "%"); + } + if (state != null) { fromsql += " and t.state = ? \n"; paraList.add(state); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java index 8404c46..5bd93b7 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java @@ -41,7 +41,7 @@ public class InvoiceLogSyncService extends BaseSyncService { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); if (receive == null) { - return Result.failed("没有有效的领用记录"); + return Result.failed("没有有效的发票领用记录"); } String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java index 0d449ca..7e792f6 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java @@ -59,7 +59,7 @@ public class InvoiceReceiveController extends Controller { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); if (receive == null) { - renderJson(Result.failed("没有有效的领用记录")); + renderJson(Result.failed("没有有效的发票领用记录")); return; } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java index 09db447..7660ab0 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java @@ -32,10 +32,11 @@ public class OrderclusterController extends BaseController { return; } - Integer state = getInt("state"); - Integer product_id = getInt("product_id"); + Integer state = getInt("state"); + Integer product_id = getInt("product_id"); renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id))); } + /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ @@ -62,6 +63,7 @@ public class OrderclusterController extends BaseController { Integer trans_co_id = getInt("trans_co_id"); renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id))); } + /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ @@ -87,8 +89,9 @@ public class OrderclusterController extends BaseController { String sn = get("sn"); Integer state = getInt("state"); Integer product_id = getInt("product_id"); + String invoice_code = get("invoice_code"); Integer isprepaid = getInt("isprepaid"); - renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, product_id))); + renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, invoice_code, product_id))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java index 55b3e87..febfd4d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java @@ -37,8 +37,9 @@ public class OrderTempController extends BaseController { Integer product_id = getInt("product_id"); Integer supermarket_id = getInt("supermarket_id"); Integer isprepaid = getInt("isprepaid"); + String invoice_code = get("invoice_code"); Integer customer_id = getInt("customer_id"); - renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id))); + renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, invoice_code, product_id))); } @Before(OrderTempPayValidator.class) @@ -113,9 +114,9 @@ public class OrderTempController extends BaseController { return; } - String sn = get("sn"); - String invalid_memo = get("invalid_memo"); - String password = get("password"); + String sn = get("sn"); + String invalid_memo = get("invalid_memo"); + String password = get("password"); renderJson(OrderTempSyncService.me.cancel(sn, invalid_memo, tokenuser, password)); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index f97c03d..b34805a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -54,7 +54,7 @@ public class OrderTempSyncService { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { - return Result.failed("没有有效的领用记录"); + return Result.failed("没有有效的发票领用记录"); } String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); @@ -238,7 +238,7 @@ public class OrderTempSyncService { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { - return Result.failed("没有有效的领用记录"); + return Result.failed("没有有效的发票领用记录"); } String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); @@ -487,7 +487,7 @@ public class OrderTempSyncService { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { - return Result.failed("没有有效的领用记录"); + return Result.failed("没有有效的发票领用记录"); } String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); @@ -905,7 +905,7 @@ public class OrderTempSyncService { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(order.getSupermarketId()); if (receive == null) { - return Result.failed("没有有效的领用记录"); + return Result.failed("没有有效的发票领用记录"); } String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java index 13e7403..3d8bf6b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java @@ -126,7 +126,7 @@ public class InvoiceReceiveController extends Controller { InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); if (receive == null) { - renderJson(Result.failed("没有有效的领用记录")); + renderJson(Result.failed("没有有效的发票领用记录")); return; } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java index 5c08060..2aeb34f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java @@ -93,6 +93,7 @@ public class OrderclusterController extends BaseController { Ordercluster model = getModel(Ordercluster.class, "", true); // 忽略不在model中的字段 renderJson(OrderclusterSyncService.me.update(model, tokenuser)); } + /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ @@ -111,10 +112,11 @@ public class OrderclusterController extends BaseController { return; } - Integer state = getInt("state"); - Integer product_id = getInt("product_id"); + Integer state = getInt("state"); + Integer product_id = getInt("product_id"); renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id))); } + /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ @@ -177,9 +179,10 @@ public class OrderclusterController extends BaseController { String truck_license = getUpperCaseVal("truck_license"); String sn = get("sn"); Integer state = getInt("state"); + String invoice_code = get("invoice_code"); Integer product_id = getInt("product_id"); Integer isprepaid = getInt("isprepaid"); - renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, product_id))); + renderJson(Result.object(OrderclusterService.me.findChildren(pp, ordercluster_id, sn, truck_license, stm, etm, isprepaid, state, invoice_code, product_id))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index ef25d68..dd575bf 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -568,7 +568,7 @@ public class OrderclusterSyncService extends BaseSyncService { public boolean run() throws SQLException { try { return oldobj.update() - && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj)) + && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) && ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -605,7 +605,7 @@ public class OrderclusterSyncService extends BaseSyncService { public boolean run() throws SQLException { try { return oldobj.update() - && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj)) + && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -643,7 +643,7 @@ public class OrderclusterSyncService extends BaseSyncService { public boolean run() throws SQLException { try { return oldobj.update() - && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj)) + && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java index 0986211..23fdfde 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java @@ -80,6 +80,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { "select * from ordercluster_truck t\n" + " left join ordercluster o on o.id = t.ordercluster_id\n" + " where t.ordercluster_id <> ? \n" + + " and o.state < 5 \n" + " and o.cutoff_time = ? \n" + " and t.truck_license in (" + StrKit.join(tsql, ",") + ")", ts.toArray()); @@ -90,7 +91,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { retts.add(bl.get("truck_license")); } - return Result.failedstr( "%s 已在[%s]分配给其他客户", StrKit.join(retts, ","), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); + return Result.failedstr( "%s 已在[%s]分配", StrKit.join(retts, ","), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); } // 查询已有的集团订单 diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java index 3c4caa9..9003d65 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java @@ -35,6 +35,7 @@ public class OrderTempController extends BaseController { String customer_name = get("customer_name"); String sn = get("sn"); Integer state = getInt("state"); + String invoice_code = get("invoice_code"); Integer product_id = getInt("product_id"); Integer supermarket_id = getInt("supermarket_id"); Integer isprepaid = getInt("isprepaid"); @@ -50,6 +51,6 @@ public class OrderTempController extends BaseController { customer_id = tokenuser.getEntityId(); } - renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, product_id))); + renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, invoice_code, product_id))); } }