diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java index 1601761f7..f658bd955 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java @@ -39,7 +39,8 @@ public class BasicCorpExportLogController { @Resource private BasicCorpService basicUnitMaintainService; @Resource - private BasicGenJsonService basicGenJsonService;; + private BasicGenJsonService basicGenJsonService; + ; @GetMapping("/udiwms/corps/exportLog/filter") public BaseResponse filter(FilterCorpExportLogRequest filterCorpExportLogRequest, @@ -110,14 +111,14 @@ public class BasicCorpExportLogController { public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); - List ids=basicCorpsExportRequest.getIds(); + List ids = basicCorpsExportRequest.getIds(); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); corpExportLogEntity.setGenKey(genKey); corpExportLogEntity.setFilePath(fileName); corpExportLogEntity.setUpdateTime(new Date()); corpExportLogEntity.setDlCount(0); - corpExportLogEntity.setRemark("本次导出数据"+ids.size()+"条"); + corpExportLogEntity.setRemark("本次导出数据" + ids.size() + "条"); corpExportLogEntity.setType(BasicProcessStatus.EXPORT_JSON); basicCorpExportLogService.insertCorpExportLog(corpExportLogEntity); //basicGenExcelService.exportCorp(genKey, corpsExportRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 6a9fba70e..b4fff904c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -35,19 +35,22 @@ public class BasicGenExcelService { SyncDataSetService syncDataSetService; @Resource HttpOkClient httpOkClient; -// + + // public String getIpUrl() { SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); return syncDataSetEntity.getSyncIp(); } -// + + // @Resource BasicCorpExportLogService basicCorpExportLogService; @Resource BasicCorpService basicUnitMaintainService; @Resource BasicProductsExportLogService basicProductsExportLogService; -// @Resource + + // @Resource // UdiRelevanceService udiRelevanceService; // @Resource // SystemParamConfigService systemParamConfigService; @@ -81,8 +84,8 @@ public class BasicGenExcelService { excelData.add(head); //选中导出 if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) { - List ids = basicCorpsExportRequest.getIds(); - for (Integer id : ids) { + List ids = basicCorpsExportRequest.getIds(); + for (Long id : ids) { BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); filterRequest.setId(id); List> genDatas = genExcelData(filterRequest); @@ -114,7 +117,8 @@ public class BasicGenExcelService { corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity); } -// + + // // //上传往来单位SMP // @Async // public void uploadCorpSmp(String genKey, CorpsExportRequest corpsExportRequest) { @@ -193,7 +197,8 @@ public class BasicGenExcelService { } basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity); } -// + + // // // @Async // public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) { @@ -262,7 +267,8 @@ public class BasicGenExcelService { } basicProductsExportLogService.updateUdiInfoExportLog(basicProductsExportLogEntity); } -// + + // // // @Async // public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index 4e81448cd..38e095ecd 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -64,7 +64,7 @@ public class BasicGenJsonService { List unitMaintainEntities = new ArrayList<>(); if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) { - List ids = basicCorpsExportRequest.getIds(); + List ids = basicCorpsExportRequest.getIds(); ids.forEach(id -> { BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest(); request.setId(id); @@ -93,7 +93,7 @@ public class BasicGenJsonService { BasicCorpExportLogResponse exportData = new BasicCorpExportLogResponse(); List unitMaintainEntities = new ArrayList<>(); if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) { - List ids = corpsExportRequest.getIds(); + List ids = corpsExportRequest.getIds(); ids.forEach(id -> { BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest(); request.setId(id); @@ -114,6 +114,7 @@ public class BasicGenJsonService { return exportData; } // + /** * 查询第三方往来单位信息 * diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index d5e7cf894..88be98cfe 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -478,8 +478,8 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/order/delBizProduct") @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) { - IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Integer.parseInt(deleteRequest.getId())); - int result = orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())); + IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Long.parseLong(deleteRequest.getId())); + int result = orderDetailBizService.deleteById(Long.parseLong(deleteRequest.getId())); if (result > 0) { boolean r1 = orderDetailBizService.isExit(orderDetailBizEntity.getOrderIdFk()); boolean r2 = orderDetailCodeService.isExit(orderDetailBizEntity.getOrderIdFk()); @@ -566,11 +566,11 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); - ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().intValue()); + ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().longValue()); - ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+""); + ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId() + ""); List list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); - if(list.size()==0){ + if (list.size() == 0) { ioOrderDetailBizEntity.setRegStatus(false); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); @@ -623,7 +623,7 @@ public class IoOrderDetailBizController extends BaseController { } @PostMapping("/udiwms/inout/biz/updateorderBiz") - public BaseResponse updateorderBiz(@RequestBody List list) { + public BaseResponse updateorderBiz(@RequestBody List list) { for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) { ioOrderDetailBizEntity.setRegStatus(true); orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); @@ -642,7 +642,7 @@ public class IoOrderDetailBizController extends BaseController { public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) { List ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest); for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { - if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null ) { + if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice())); } String msg = ""; diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index c1fa3f54c..e0ad1e9b4 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -8,8 +8,8 @@ import java.math.BigDecimal; @Data @TableName(value = "io_order_detail_biz") public class IoOrderDetailBizEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.INPUT) + private Long id; /** * 订单号外键 @@ -186,7 +186,6 @@ public class IoOrderDetailBizEntity { private String checkFileName; - @TableField(exist = false) private boolean checkSuccess; diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index 2f7635e15..269122ada 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java @@ -11,8 +11,8 @@ import java.math.BigDecimal; @Data @TableName(value = "io_order_detail_code") public class IoOrderDetailCodeEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.INPUT) + private Long id; /** * 订单号外键 @@ -195,5 +195,4 @@ public class IoOrderDetailCodeEntity { private boolean regStatus; - } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index 348378f85..a332a5884 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java @@ -104,7 +104,7 @@ public class IoOrderInvoiceEntity { private String remark; @TableField(value = "bizIdFk") - private Integer bizIdFk; + private Long bizIdFk; @TableField(exist = false) private Integer regId; diff --git a/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java index 94e8a7b83..72a8f1b9a 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java @@ -6,7 +6,7 @@ import java.util.List; @Data public class BasicCorpsExportRequest { - List ids; + List ids; private Integer id; private String key; private String unitId; diff --git a/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java b/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java index 43710c4b9..722386dcf 100644 --- a/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java +++ b/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class BizBindUpdateRequest { - private Integer id; + private Long id; private Long bindRlFk; private String supId; diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java index bb5fbe3ac..e8eaaa0bf 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -60,7 +60,7 @@ public class IoOrderInvoiceRequest { private String remark; - private Integer bizIdFk; + private Long bizIdFk; public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index 12da4aa1f..cee26d94e 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; @Data public class IoOrderDetailBizResponse { - private Integer id; + private Long id; /** * 订单号外键 diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java index 453033d0f..cebe12d4c 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; @Data public class IoOrderDetailCodeResponse { - private Integer id; + private Long id; /** * 订单号外键 diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 4e19d277f..3adee5a47 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -12,7 +12,7 @@ import java.util.List; public interface IoOrderDetailBizService { - IoOrderDetailBizEntity selectById(Integer id); + IoOrderDetailBizEntity selectById(Long id); List findByOrderId(String orderId); @@ -22,13 +22,13 @@ public interface IoOrderDetailBizService { int update(IoOrderDetailBizEntity orderDetailBizEntity); - int deleteById(Integer id); + int deleteById(Long id); int deleteByOrderId(String billNo); boolean isExit(String billNo); - boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId); + boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId); IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo, String productDate, String expireDate); @@ -44,6 +44,7 @@ public interface IoOrderDetailBizService { List checkOrderList(String orderId); List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index cc6c8f5dd..6a4539205 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -19,7 +19,7 @@ public interface IoOrderDetailCodeService { int update(IoOrderDetailCodeEntity orderDetailCodeEntity); - int deleteById(Integer id); + int deleteById(Long id); /** * 查询单据扫码详情VO列表 diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 841a00aaa..457abea9a 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -35,7 +36,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { IoOrderDetailBizDao ioOrderDetailBizDao; @Override - public IoOrderDetailBizEntity selectById(Integer id) { + public IoOrderDetailBizEntity selectById(Long id) { return ioOrderDetailBizDao.selectById(id); } @@ -57,7 +58,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public int insert(IoOrderDetailBizEntity orderDetailBizEntity) { - orderDetailBizEntity.setId(null); + if (orderDetailBizEntity.getId() == null) + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); return ioOrderDetailBizDao.insert(orderDetailBizEntity); } @@ -67,7 +69,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } @Override - public int deleteById(Integer id) { + public int deleteById(Long id) { return ioOrderDetailBizDao.deleteById(id); } @@ -85,7 +87,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override - public boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId) { + public boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId) { return ioOrderDetailBizDao.exists(new QueryWrapper().eq("bindRlFk", relId).eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo) .isNull(StrUtil.isEmpty(bacthNo), "batchNo").eq("orderIdFk", orderId).ne("id", ignoreId)); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 80f1163df..7c3a2b7f3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -58,7 +59,9 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Override public int insert(IoOrderDetailCodeEntity orderDetailCodeEntity) { - orderDetailCodeEntity.setId(null); + if (orderDetailCodeEntity.getId() == null) { + orderDetailCodeEntity.setId(IdUtil.getSnowflakeNextId()); + } return ioOrderDetailCodeDao.insert(orderDetailCodeEntity); } @@ -68,7 +71,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { } @Override - public int deleteById(Integer id) { + public int deleteById(Long id) { return ioOrderDetailCodeDao.deleteById(id); } @@ -121,7 +124,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Override public Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity) { - return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity)>0; + return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity) > 0; } } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index c0945ead6..e7eddb38c 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -412,3 +412,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'serialNo', 'varchar(255)', 1 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1); + + +CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2); +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);