diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 4d365fe96..161e83f77 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -195,9 +195,9 @@ public class EmisWaybillController extends EmisBaseController
}
- @Log(title = "取消订单", businessType = BusinessType.INSERT)
- @PostMapping(value = "/cancelOrder")
- public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder)
+ @Log(title = "确认接单", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/confirmOrder")
+ public AjaxResult confirmOrder(@Valid @RequestBody WaybillOrder waybillOrder)
{
try {
@@ -207,8 +207,8 @@ public class EmisWaybillController extends EmisBaseController
EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setOrderSn(waybillOrder.getOrderSn());
- emisWaybill.setOrderRemark(waybillOrder.getOrderRemark());
- emisWaybillService.cancelOrder(emisWaybill);
+// emisWaybill.setOrderRemark(waybillOrder.getOrderRemark());
+ emisWaybillService.confirmOrder(emisWaybill);
return AjaxResult.success("取消成功");
}catch(EmisBizError ex){
@@ -602,7 +602,6 @@ public class EmisWaybillController extends EmisBaseController
}
-
/**
* 获取运单统计信息
* @param emisWaybill
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index ded427bc3..10e97d040 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -614,7 +614,6 @@ public class EmisBaseService {
}
-
/**
* 获取网点结算账户信息
* @param siteCode
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
index 9e1ac20ac..48ff2a119 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
@@ -290,7 +290,7 @@ isOfferInvoiceDetail String N 1 是否需要提供明细 Y-提供，N-不提供
}
- public static void main1(String[] args) {
+ public static void main2(String[] args) {
/*
{
@@ -338,7 +338,7 @@ APP Secret：8962fd753b054da88409b18743a6e7c0
String token=getToken("9132010469040698XG","8962fd753b054da88409b18743a6e7c0");
// 91320104MA258WWMX2 丝路卡航（江苏）物流服务有限公司 4000251756 南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1527号 交通银行股份有限公司南京新街口支行 320899991013001239978 2024-07-24 11:19:25 2024-07-24 11:45:21
- order.setOrderNo("TST2024072400-2");
+ order.setOrderNo("TST2024072400-3");
order.setBuyerTaxNum("91320104MA258WWMX2");
order.setBuyerName("丝路卡航（江苏）物流服务有限公司");
order.setBuyerAddress("南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1527号");
@@ -416,7 +416,8 @@ APP Secret：8962fd753b054da88409b18743a6e7c0
public static void main(String[] args) {
String token=getToken("9132010469040698XG","8962fd753b054da88409b18743a6e7c0");
- JSONObject jRstObj=HXSdk.queryInvoiceResult("TST2024072400-2",token);
+// JSONObject jRstObj=HXSdk.queryInvoiceResult("TST2024072400-2",token);
+ JSONObject jRstObj=HXSdk.queryInvoiceResult("1816652177079271424",token);
System.out.println(jRstObj.toJSONString());
//{"code":"00000","data":{"invoiceInfos":[{"listFlag":"N","naturalPersonFlag":"0","buyerBankAccount":"320899991013001239978","pushMode":"-1","exTaxAmount":1.00,"returnStatus":"E9638","buyerAddress":"南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1527号","salerBank":"中国工商银行南京市新街口支行","invoiceType":"1","model":"normal","showBankAccountType":"0","specificFactor":"0","buyerBank":"交通银行股份有限公司南京新街口支行","orderNo":"TST2024072400-2","deliverEmail":"linfso@126.com","salerBankAccount":"4301010009100803890","withTaxFlag":"1","salerNaturalPersonFlag":"0","taxAmount":0.00,"orderDate":"2024-07-24 16:50:38","status":"0","buyerTel":"4000251756","salerName":"江苏探路者国际物流有限公司","orderAmount":1.00,"buyerTaxNum":"91320104MA258WWMX2","invoiceLine":"p","salerTel":"025-85657080","returnStatusMsg":"第1条明细中零税率标识为非零税率时，税率不能为0%","buyerName":"丝路卡航（江苏）物流服务有限公司","salerAddress":"南京市秦淮区正学路1号南京晨光1865创意产业园F3幢1137号","invoiceSerialNum":"1816033232493576194","salerTaxNum":"9132010469040698XG"}]},"success":true,"message":"请求成功"}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 3330273a5..e452df438 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -114,6 +114,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode}
+
+ and a.problem_type = #{params.problemType}
+
+
+
+ and a.receive_company like concat('%', #{params.receiveCompany}, '%')
+
+
+
+
+ and a.send_company like concat('%', #{params.sendCompany}, '%')
+
+
+
+
and b.bl_merge='0'
and b.bl_confirm_center='1'
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 03b1364c2..127b3fe24 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -142,13 +142,22 @@
and (
b.dispatch_underling_site_code in (
- SELECT t1.site_code FROM (
- SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
- #{params.privSiteCode} ) pd
- WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
- UNION
- SELECT #{params.privSiteCode} FROM dual
- )
+ SELECT t1.site_code FROM (
+ SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+ #{params.privSiteCode} ) pd
+ WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+ UNION
+ SELECT #{params.privSiteCode} FROM dual
+ )
+ or
+ b.send_site_code in (
+ SELECT t1.site_code FROM (
+ SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+ #{params.privSiteCode} ) pd
+ WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+ UNION
+ SELECT #{params.privSiteCode} FROM dual
+ )
)
)