From 374bc3019fe172473ca2ebb345edccf15102e0e1 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 21 Jun 2024 19:43:22 +0800 Subject: [PATCH] md --- .../emis/EmisWaybillTransferController.java | 126 +++++++++--------- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java index 548752a33..0a8aff6b2 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -19,12 +19,14 @@ import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; +import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import com.xdadan.erp.emis.utils.WaybillHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -60,6 +62,11 @@ public class EmisWaybillTransferController extends EmisBaseController @Autowired private IEmisTmsScanRecordService emisTmsScanRecordService; + @Autowired + private EmisBaseService emisBaseService; + + + /** * 查询运单转件表列表 */ @@ -114,8 +121,6 @@ public class EmisWaybillTransferController extends EmisBaseController @PostMapping public AjaxResult add(@RequestBody EmisWaybillTransfer emisWaybillTransfer) { - - // 做转单扫描登记 /* { @@ -137,6 +142,12 @@ public class EmisWaybillTransferController extends EmisBaseController */ // int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer); + EmisWaybillTransfer query = new EmisWaybillTransfer(); + query.setBillCode(emisWaybillTransfer.getBillCode()); + List list=emisWaybillTransferService.selectEmisWaybillTransferList(query); + if(!CollectionUtils.isEmpty(list)){ + return AjaxResult.error("转件登记重复!"); + } ScanInfo scanInfo = new ScanInfo(); List> scanDataList = new ArrayList<>(); @@ -162,10 +173,7 @@ public class EmisWaybillTransferController extends EmisBaseController try { emisTmsScanRecordService.scan(scanInfo); - } catch (EmisBizError emisBizError) { - emisBizError.printStackTrace(); - return AjaxResult.error(emisBizError.getMessage()); - }catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("数据异常!"); } @@ -173,61 +181,57 @@ public class EmisWaybillTransferController extends EmisBaseController return AjaxResult.success("成功",1); } - /** - * 修改运单转件表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:edit')") - @Log(title = "运单转件表", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisWaybillTransfer emisWaybillTransfer) - { - - - int ret=emisWaybillTransferService.updateEmisWaybillTransfer(emisWaybillTransfer); - // 做转单扫描登记 - /* - { - "scanType": "80", - "opType": "1-检查 2-确认", - "scanData": [ - { - "billCode": "T001,T002,T002", - "transferCode": "转单同行快递代码", - "transferBillcode": "转单同行单号", - "destCity": "目的城市", - "scanDate": "2024-05-02 12:03:05", - "scanWeight": "0.0" - } - ] - } - */ - - ScanInfo scanInfo = new ScanInfo(); - List> scanDataList = new ArrayList<>(); - scanInfo.setOpType(2); - scanInfo.setScanType(ScanType.TRANSFER.opCode); - Map scanDateItem = new HashMap<>(); - scanDateItem.put("billCode",emisWaybillTransfer.getBillCode()); - scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress()); - scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode()); - scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity()); - scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); - scanDateItem.put("scanWeight", "0.0"); - scanDataList.add(scanDateItem); - scanInfo.setScanData(scanDataList); - - try { - emisTmsScanRecordService.scan(scanInfo); - } catch (EmisBizError emisBizError) { - emisBizError.printStackTrace(); - return AjaxResult.error(emisBizError.getMessage()); - }catch (Exception e) { - e.printStackTrace(); - return AjaxResult.error("数据异常!"); - } - - return AjaxResult.success("成功",ret); - } +// /** +// * 修改运单转件表 +// */ +// @PreAuthorize("@ss.hasPermi('emis:emisWaybillTransfer:edit')") +// @Log(title = "运单转件表", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody EmisWaybillTransfer emisWaybillTransfer) +// { +// +// int ret=emisWaybillTransferService.updateEmisWaybillTransfer(emisWaybillTransfer); +// // 做转单扫描登记 +// /* +// { +// "scanType": "80", +// "opType": "1-检查 2-确认", +// "scanData": [ +// { +// "billCode": "T001,T002,T002", +// "transferCode": "转单同行快递代码", +// "transferBillcode": "转单同行单号", +// "destCity": "目的城市", +// "scanDate": "2024-05-02 12:03:05", +// "scanWeight": "0.0" +// } +// ] +// } +// */ +// +// ScanInfo scanInfo = new ScanInfo(); +// List> scanDataList = new ArrayList<>(); +// scanInfo.setOpType(2); +// scanInfo.setScanType(ScanType.TRANSFER.opCode); +// Map scanDateItem = new HashMap<>(); +// scanDateItem.put("billCode",emisWaybillTransfer.getBillCode()); +// scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress()); +// scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode()); +// scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity()); +// scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); +// scanDateItem.put("scanWeight", "0.0"); +// scanDataList.add(scanDateItem); +// scanInfo.setScanData(scanDataList); +// +// try { +// emisTmsScanRecordService.scan(scanInfo); +// } catch (Exception e) { +// e.printStackTrace(); +// return AjaxResult.error("数据异常!"); +// } +// +// return AjaxResult.success("成功",ret); +// } /** * 删除运单转件表