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

.

dev
lisai17@sina.com 2020-09-14 23:58:37 +08:00
parent b1a99adb0d
commit ecf2bb8a73
13 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java
View File

@ -39,7 +39,7 @@ public class InvoiceReceiveService extends BaseService {
public String nextInvoice(InvoiceReceive receive) { public String nextInvoice(InvoiceReceive receive) {
if (receive == null) { if (receive == null) {
log.debug("没有有效的领用记录"); log.debug("没有有效的发票领用记录");
return null; return null;
} }

9
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java
View File

@ -456,6 +456,7 @@ public class OrderclusterService extends BaseService {
String etm, String etm,
Integer isprepaid, Integer isprepaid,
Integer state, Integer state,
String invoice_code,
Integer product_id Integer product_id
) { ) {
String salesql = "select \n" + String salesql = "select \n" +
@ -510,6 +511,14 @@ public class OrderclusterService extends BaseService {
tempPara.add("%" + truck_license + "%"); 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)) { if (StrKit.notBlank(stm)) {
salesql += " and t.create_time >= ? \n"; salesql += " and t.create_time >= ? \n";
tempsql += " and t.create_time >= ? \n"; tempsql += " and t.create_time >= ? \n";

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
View File

@ -69,6 +69,7 @@ public class OrderTempService extends BaseService {
String etm, String etm,
Integer isprepaid, Integer isprepaid,
Integer state, Integer state,
String invoice_code,
Integer product_id Integer product_id
) { ) {
String selectsql = "select t.* " + String selectsql = "select t.* " +
@ -128,6 +129,11 @@ public class OrderTempService extends BaseService {
paraList.add(product_id); paraList.add(product_id);
} }
if (StrKit.notBlank(invoice_code)) {
fromsql += " and t.invoice_code like ? \n";
paraList.add("%" + invoice_code + "%");
}
if (state != null) { if (state != null) {
fromsql += " and t.state = ? \n"; fromsql += " and t.state = ? \n";
paraList.add(state); paraList.add(state);

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java
View File

@ -41,7 +41,7 @@ public class InvoiceLogSyncService extends BaseSyncService {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id);
if (receive == null) { if (receive == null) {
return Result.failed("没有有效的领用记录"); return Result.failed("没有有效的发票领用记录");
} }
String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive);

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java
View File

@ -59,7 +59,7 @@ public class InvoiceReceiveController extends Controller {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id);
if (receive == null) { if (receive == null) {
renderJson(Result.failed("没有有效的领用记录")); renderJson(Result.failed("没有有效的发票领用记录"));
return; return;
} }

5
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java
View File

@ -36,6 +36,7 @@ public class OrderclusterController extends BaseController {
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id))); renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id)));
} }
/** /**
* 分页查找 ordercluster 订单簇 - 集团客户订单 * 分页查找 ordercluster 订单簇 - 集团客户订单
*/ */
@ -62,6 +63,7 @@ public class OrderclusterController extends BaseController {
Integer trans_co_id = getInt("trans_co_id"); 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))); renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id)));
} }
/** /**
* 分页查找 ordercluster 订单簇 - 集团客户订单 * 分页查找 ordercluster 订单簇 - 集团客户订单
*/ */
@ -87,8 +89,9 @@ public class OrderclusterController extends BaseController {
String sn = get("sn"); String sn = get("sn");
Integer state = getInt("state"); Integer state = getInt("state");
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
String invoice_code = get("invoice_code");
Integer isprepaid = getInt("isprepaid"); 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)));
} }
/** /**

3
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java
View File

@ -37,8 +37,9 @@ public class OrderTempController extends BaseController {
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
Integer isprepaid = getInt("isprepaid"); Integer isprepaid = getInt("isprepaid");
String invoice_code = get("invoice_code");
Integer customer_id = getInt("customer_id"); 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) @Before(OrderTempPayValidator.class)

8
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
View File

@ -54,7 +54,7 @@ public class OrderTempSyncService {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId());
if (receive == null) { if (receive == null) {
return Result.failed("没有有效的领用记录"); return Result.failed("没有有效的发票领用记录");
} }
String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive);
@ -238,7 +238,7 @@ public class OrderTempSyncService {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId());
if (receive == null) { if (receive == null) {
return Result.failed("没有有效的领用记录"); return Result.failed("没有有效的发票领用记录");
} }
String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive);
@ -487,7 +487,7 @@ public class OrderTempSyncService {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId());
if (receive == null) { if (receive == null) {
return Result.failed("没有有效的领用记录"); return Result.failed("没有有效的发票领用记录");
} }
String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive);
@ -905,7 +905,7 @@ public class OrderTempSyncService {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(order.getSupermarketId()); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(order.getSupermarketId());
if (receive == null) { if (receive == null) {
return Result.failed("没有有效的领用记录"); return Result.failed("没有有效的发票领用记录");
} }
String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive); String next_invoice_code = InvoiceReceiveService.me.nextInvoice(receive);

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java
View File

@ -126,7 +126,7 @@ public class InvoiceReceiveController extends Controller {
InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id); InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(supermarket_id);
if (receive == null) { if (receive == null) {
renderJson(Result.failed("没有有效的领用记录")); renderJson(Result.failed("没有有效的发票领用记录"));
return; return;
} }

5
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java
View File

@ -93,6 +93,7 @@ public class OrderclusterController extends BaseController {
Ordercluster model = getModel(Ordercluster.class, "", true); // 忽略不在model中的字段 Ordercluster model = getModel(Ordercluster.class, "", true); // 忽略不在model中的字段
renderJson(OrderclusterSyncService.me.update(model, tokenuser)); renderJson(OrderclusterSyncService.me.update(model, tokenuser));
} }
/** /**
* 分页查找 ordercluster 订单簇 - 集团客户订单 * 分页查找 ordercluster 订单簇 - 集团客户订单
*/ */
@ -115,6 +116,7 @@ public class OrderclusterController extends BaseController {
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id))); renderJson(Result.object(OrderclusterService.me.findTemp(pp, supermarket_id, customer_name, stm, etm, state, product_id)));
} }
/** /**
* 分页查找 ordercluster 订单簇 - 集团客户订单 * 分页查找 ordercluster 订单簇 - 集团客户订单
*/ */
@ -177,9 +179,10 @@ public class OrderclusterController extends BaseController {
String truck_license = getUpperCaseVal("truck_license"); String truck_license = getUpperCaseVal("truck_license");
String sn = get("sn"); String sn = get("sn");
Integer state = getInt("state"); Integer state = getInt("state");
String invoice_code = get("invoice_code");
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
Integer isprepaid = getInt("isprepaid"); 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)));
} }
/** /**

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
View File

@ -568,7 +568,7 @@ public class OrderclusterSyncService extends BaseSyncService {
public boolean run() throws SQLException { public boolean run() throws SQLException {
try { try {
return oldobj.update() 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); && ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -605,7 +605,7 @@ public class OrderclusterSyncService extends BaseSyncService {
public boolean run() throws SQLException { public boolean run() throws SQLException {
try { try {
return oldobj.update() 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); && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -643,7 +643,7 @@ public class OrderclusterSyncService extends BaseSyncService {
public boolean run() throws SQLException { public boolean run() throws SQLException {
try { try {
return oldobj.update() 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); && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);

3
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java
View File

@ -80,6 +80,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService {
"select * from ordercluster_truck t\n" + "select * from ordercluster_truck t\n" +
" left join ordercluster o on o.id = t.ordercluster_id\n" + " left join ordercluster o on o.id = t.ordercluster_id\n" +
" where t.ordercluster_id <> ? \n" + " where t.ordercluster_id <> ? \n" +
" and o.state < 5 \n" +
" and o.cutoff_time = ? \n" + " and o.cutoff_time = ? \n" +
" and t.truck_license in (" + StrKit.join(tsql, ",") + ")", ts.toArray()); " 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")); 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()));
} }
// 查询已有的集团订单 // 查询已有的集团订单

3
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java
View File

@ -35,6 +35,7 @@ public class OrderTempController extends BaseController {
String customer_name = get("customer_name"); String customer_name = get("customer_name");
String sn = get("sn"); String sn = get("sn");
Integer state = getInt("state"); Integer state = getInt("state");
String invoice_code = get("invoice_code");
Integer product_id = getInt("product_id"); Integer product_id = getInt("product_id");
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
Integer isprepaid = getInt("isprepaid"); Integer isprepaid = getInt("isprepaid");
@ -50,6 +51,6 @@ public class OrderTempController extends BaseController {
customer_id = tokenuser.getEntityId(); 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)));
} }
} }