aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-21 15:17:12 +08:00
parent 7ad11bc782
commit b3d9dd3b5d
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -317,7 +317,7 @@ public class EmisCommonController extends EmisBaseController
@RequestMapping("/getPrintDataByPrinter") @GetMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode) public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode)
{ {
@ -378,7 +378,7 @@ public class EmisCommonController extends EmisBaseController
/** /**
* 获取打印模版 * 获取打印模版
*/ */
@RequestMapping(value = "/getTnPrinterLocalPrintTpl") @GetMapping(value = "/getTnPrinterLocalPrintTpl")
public AjaxResult getTnPrinterLocalPrintTpl(String key,String siteCode,String appCode) public AjaxResult getTnPrinterLocalPrintTpl(String key,String siteCode,String appCode)
{ {
try { try {
@ -423,7 +423,7 @@ public class EmisCommonController extends EmisBaseController
* @param sign * @param sign
* @return * @return
*/ */
@RequestMapping("/queryTraceInfo") @GetMapping("/queryTraceInfo")
public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String sign) public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String sign)
{ {
if(StringUtils.isAnyEmpty(mainNo,appId,sign)){ if(StringUtils.isAnyEmpty(mainNo,appId,sign)){
@ -450,7 +450,7 @@ public class EmisCommonController extends EmisBaseController
* 短信发送触发 * 短信发送触发
* @return * @return
*/ */
@RequestMapping("/autoDoSendSmsTrigger") @GetMapping("/autoDoSendSmsTrigger")
public AjaxResult autoDoSendSmsTrigger(){ public AjaxResult autoDoSendSmsTrigger(){
String lockKey="autoDoSendSmsTrigger"; String lockKey="autoDoSendSmsTrigger";
log.error("autoDoSendSmsTrigger start"); log.error("autoDoSendSmsTrigger start");
@ -475,7 +475,7 @@ public class EmisCommonController extends EmisBaseController
* 物流轨迹采集触发 * 物流轨迹采集触发
* @return * @return
*/ */
@RequestMapping("/autoDoQueryTransferInfoTrigger") @GetMapping("/autoDoQueryTransferInfoTrigger")
public AjaxResult autoDoQueryTransferInfoTrigger(){ public AjaxResult autoDoQueryTransferInfoTrigger(){
String lockKey="autoDoQueryTransferInfoTrigger"; String lockKey="autoDoQueryTransferInfoTrigger";
log.error("autoDoQueryTransferInfoTrigger start"); log.error("autoDoQueryTransferInfoTrigger start");

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
View File

@ -26,6 +26,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillService;
import com.xdadan.erp.system.domain.SysNotice; import com.xdadan.erp.system.domain.SysNotice;
import com.xdadan.erp.system.service.ISysNoticeService; import com.xdadan.erp.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -59,7 +60,7 @@ public class EmisCommonToolsController extends EmisBaseController
/** /**
* 获取app首页统计 * 获取app首页统计
*/ */
@RequestMapping(value = "/getAppHomeStatData") @GetMapping(value = "/getAppHomeStatData")
public AjaxResult getAppHomeStatData() public AjaxResult getAppHomeStatData()
{ {
try { try {
@ -105,7 +106,7 @@ public class EmisCommonToolsController extends EmisBaseController
} }
@RequestMapping(value = "/getLatestNotices") @GetMapping(value = "/getLatestNotices")
@JacksonFilter(include= {"noticeId","noticeTitle","noticeType","noticeContent","createTime"},value= SysNotice.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"noticeId","noticeTitle","noticeType","noticeContent","createTime"},value= SysNotice.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
public TableDataInfo getLatestNotices(SysNotice notice) public TableDataInfo getLatestNotices(SysNotice notice)
{ {

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java
View File

@ -122,7 +122,7 @@ public class EmisGoodsController extends EmisBaseController
"licNo", "licNo",
"orderNum" "orderNum"
},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listHotGoods") @GetMapping("/listHotGoods")
public TableDataInfo listHotGoods(String customerCode) public TableDataInfo listHotGoods(String customerCode)
{ {
startPage(); startPage();

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
View File

@ -63,7 +63,7 @@ public class EmisStaffController extends EmisBaseController
*/ */
// @PreAuthorize("@ss.hasPermi('system:user:list')") // @PreAuthorize("@ss.hasPermi('system:user:list')")
@JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getStaffList") @GetMapping("/getStaffList")
public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue) public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue)
{ {
SysUser queryUser = new SysUser(); SysUser queryUser = new SysUser();
@ -103,7 +103,7 @@ public class EmisStaffController extends EmisBaseController
* @return * @return
*/ */
@JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getPayeeList") @GetMapping("/getPayeeList")
public TableDataInfo getPayeeList(String searchValue) public TableDataInfo getPayeeList(String searchValue)
{ {
SysUser queryUser = new SysUser(); SysUser queryUser = new SysUser();
@ -119,7 +119,7 @@ public class EmisStaffController extends EmisBaseController
* @return * @return
*/ */
@JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getSalemanList") @GetMapping("/getSalemanList")
public TableDataInfo getSalesmenList(String searchValue) public TableDataInfo getSalesmenList(String searchValue)
{ {
SysUser queryUser = new SysUser(); SysUser queryUser = new SysUser();
@ -129,7 +129,7 @@ public class EmisStaffController extends EmisBaseController
return getDataTable(list); return getDataTable(list);
} }
@RequestMapping("/getStaffQRCodePng") @GetMapping("/getStaffQRCodePng")
public void getStaffQRCodePng(HttpServletResponse response,Integer size) public void getStaffQRCodePng(HttpServletResponse response,Integer size)
{ {

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -205,7 +205,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
* @param trackingNo * @param trackingNo
* @return * @return
*/ */
@RequestMapping("/queryWaybillTraceInfo") @GetMapping("/queryWaybillTraceInfo")
public AjaxResult queryWaybillTraceInfo(String trackingNo,String lang) public AjaxResult queryWaybillTraceInfo(String trackingNo,String lang)
{ {
if(StringUtils.isEmpty(trackingNo)){ if(StringUtils.isEmpty(trackingNo)){

20
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -92,7 +92,7 @@ public class EmisWaybillController extends EmisBaseController
private IEmisTmsScanRecordService emisTmsScanRecordService; private IEmisTmsScanRecordService emisTmsScanRecordService;
@RequestMapping(value = "/checkWaybillIsExists") @GetMapping(value = "/checkWaybillIsExists")
public AjaxResult checkWaybillIsExists(String billCode){ public AjaxResult checkWaybillIsExists(String billCode){
return AjaxResult.success("操作成功", emisBaseService.checkWaybillIsExists(billCode)); return AjaxResult.success("操作成功", emisBaseService.checkWaybillIsExists(billCode));
} }
@ -100,7 +100,7 @@ public class EmisWaybillController extends EmisBaseController
/** /**
* 获取电子运单信息 * 获取电子运单信息
*/ */
@RequestMapping(value = "/getWaybillDetail") @GetMapping(value = "/getWaybillDetail")
public AjaxResult getWaybillDetail(String billCode ,String orderSn) public AjaxResult getWaybillDetail(String billCode ,String orderSn)
{ {
try { try {
@ -445,7 +445,7 @@ public class EmisWaybillController extends EmisBaseController
* @param emisWaybill * @param emisWaybill
* @return * @return
*/ */
@RequestMapping("/getWaybillStatMap") @GetMapping("/getWaybillStatMap")
public AjaxResult getWaybillStatMap(EmisWaybill emisWaybill) public AjaxResult getWaybillStatMap(EmisWaybill emisWaybill)
{ {
// 设置通用权限查询参数 // 设置通用权限查询参数
@ -457,7 +457,7 @@ public class EmisWaybillController extends EmisBaseController
} }
@RequestMapping("/selectEmisWaybillByMutiBillCode") @GetMapping("/selectEmisWaybillByMutiBillCode")
public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill) public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill)
{ {
startPage(); startPage();
@ -526,7 +526,7 @@ public class EmisWaybillController extends EmisBaseController
// @JacksonFilter(include= { // @JacksonFilter(include= {
// "billCode","scanDate" // "billCode","scanDate"
// },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) // },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/queryScanWaybillList") @GetMapping("/queryScanWaybillList")
public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord,String scanStatType, String beginScanDate, String endScanDate, String billCode ) public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord,String scanStatType, String beginScanDate, String endScanDate, String billCode )
{ {
@ -558,7 +558,7 @@ public class EmisWaybillController extends EmisBaseController
return getDataTable(list); return getDataTable(list);
} }
@RequestMapping("/realGetWaybillPrintData") @GetMapping("/realGetWaybillPrintData")
public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf)
{ {
/* /*
@ -625,7 +625,7 @@ public class EmisWaybillController extends EmisBaseController
return AjaxResult.error("获取失败"); return AjaxResult.error("获取失败");
} }
@RequestMapping("/realGetPrintList") @GetMapping("/realGetPrintList")
public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType) public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType)
{ {
/* /*
@ -763,7 +763,7 @@ public class EmisWaybillController extends EmisBaseController
} }
@RequestMapping("/realGetWaybillPdf") @GetMapping("/realGetWaybillPdf")
public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode,String isNeedPdf) public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode,String isNeedPdf)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
@ -792,7 +792,7 @@ public class EmisWaybillController extends EmisBaseController
} }
@RequestMapping("/realGetWaybillPng") @GetMapping("/realGetWaybillPng")
public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf) public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String printManCode,String isNeedPdf)
{ {
@ -850,7 +850,7 @@ public class EmisWaybillController extends EmisBaseController
} }
@RequestMapping("/getPrintDataByPrinter") @GetMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode) public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String printManCode)
{ {