From d6f9e3f06a25a356ebab01077287ff33b786f722 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 4 Jul 2023 17:54:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sync/SpsSyncDownloadController.java | 5 +++++ .../com/glxp/api/entity/inout/IoOrderEntity.java | 14 +++++++++++++- src/main/resources/schemas/schema_v2.1.sql | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index d0207690..db8474ff 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -667,6 +667,11 @@ public class SpsSyncDownloadController { InvWarehouseEntity parentInv = invWarehouseService.findOneLevel(invWarehouseEntity.getParentCode()); if (parentInv == null) parentInv = invWarehouseEntity; + + orderEntity.setRmFromCorp(orderEntity.getFromCorp()); + orderEntity.setRmDeptCode(orderEntity.getDeptCode()); + orderEntity.setRmInvCode(orderEntity.getInvCode()); + orderEntity.setInvCode(parentInv.getCode()); orderEntity.setDeptCode(parentInv.getParentId()); orderEntity.setFromCorp("科室使用出库"); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index b8fbae06..f5c38ba8 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -243,7 +243,7 @@ public class IoOrderEntity { @TableField(value = "checkPreInOrders") private String checkPreInOrders; - + // 预验收按货位出库，退货 @TableField(value = "checkPreInInvCode") private String checkPreInInvCode; @@ -252,4 +252,16 @@ public class IoOrderEntity { @TableField(value = "checkPreInSpaceCode") private String checkPreInSpaceCode; + + // 使用出库单备注字段 + //备注往来单位（病人信息） + @TableField(value = "rmFromCorp") + private String rmFromCorp; + //备注部门 + @TableField(value = "rmDeptCode") + private String rmDeptCode; + //备注仓库号 + @TableField(value = "rmInvCode") + private String rmInvCode; + } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 11c0f33e..537cfab9 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -431,3 +431,8 @@ INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, ` `paramType`, `paramExplain`, `updateTime`) VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL); + + +CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1); From 654d32def050d7db71e8d55dc96599cb7ad7155b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 5 Jul 2023 11:46:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B3=E8=81=94DI=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 4bebbf6e..bf27ad05 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -354,6 +354,57 @@ public class UdiContrastController { public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); + List originProductEntities = udiProductService.findByUuids(udiRelevanceEntity.getUuid()); + if (CollUtil.isNotEmpty(originProductEntities) && CollUtil.isNotEmpty(udiInfoEntities)) { + UdiProductEntity originProductEntity = originProductEntities.get(0); + for (UdiProductEntity udiProductEntity : udiInfoEntities) { + if (StrUtil.isEmpty(udiProductEntity.getSptm())) { + udiProductEntity.setSptm(originProductEntity.getSptm()); + } + if (StrUtil.isEmpty(udiProductEntity.getYbbm())) { + udiProductEntity.setYbbm(originProductEntity.getYbbm()); + } + if (StrUtil.isEmpty(udiProductEntity.getMeasname())) { + udiProductEntity.setMeasname(originProductEntity.getMeasname()); + } + if (StrUtil.isEmpty(udiProductEntity.getManufactory())) { + udiProductEntity.setManufactory(originProductEntity.getManufactory()); + } + if (StrUtil.isEmpty(udiProductEntity.getPrice())) { + udiProductEntity.setPrice(originProductEntity.getPrice()); + } + if (StrUtil.isEmpty(udiProductEntity.getSpmc())) { + udiProductEntity.setSpmc(originProductEntity.getSpmc()); + } + if (StrUtil.isEmpty(udiProductEntity.getCpms())) { + udiProductEntity.setCpms(originProductEntity.getCpms()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak1())) { + udiProductEntity.setBasicPrductRemak1(originProductEntity.getBasicPrductRemak1()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak2())) { + udiProductEntity.setBasicPrductRemak2(originProductEntity.getBasicPrductRemak2()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak3())) { + udiProductEntity.setBasicPrductRemak3(originProductEntity.getBasicPrductRemak3()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak4())) { + udiProductEntity.setBasicPrductRemak4(originProductEntity.getBasicPrductRemak4()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak5())) { + udiProductEntity.setBasicPrductRemak5(originProductEntity.getBasicPrductRemak5()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak6())) { + udiProductEntity.setBasicPrductRemak6(originProductEntity.getBasicPrductRemak6()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak7())) { + udiProductEntity.setBasicPrductRemak7(originProductEntity.getBasicPrductRemak7()); + } + if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak8())) { + udiProductEntity.setBasicPrductRemak8(originProductEntity.getBasicPrductRemak8()); + } + } + } udiProductService.deleteByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUpdateTime(new Date()); From dce2904b653cdd3f5cd86704e54a28bb182dd01c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 5 Jul 2023 22:18:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=99=BB=E8=AE=B0=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 1 + .../inout/IoOrderDetailBizController.java | 1 + .../inout/IoOrderInvoiceController.java | 55 ++++++++++++++++- .../api/dao/inout/IoOrderInvoiceMapper.java | 6 ++ .../api/req/inout/IoOrderInvoiceRequest.java | 3 +- .../glxp/api/req/system/DeleteRequest.java | 1 + .../api/res/inout/IoOrderInvoiceResponse.java | 1 - .../service/inout/IoChangeInoutService.java | 1 + .../service/inout/IoCheckInoutService.java | 1 + .../service/inout/IoOrderInvoiceService.java | 31 ---------- ...ceImpl.java => IoOrderInvoiceService.java} | 47 ++++++++------- .../service/sync/SpsSyncDownloadService.java | 1 + .../mapper/inout/IoOrderInvoiceMapper.xml | 59 +++++++++++++++++-- 13 files changed, 148 insertions(+), 60 deletions(-) delete mode 100644 src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java rename src/main/java/com/glxp/api/service/inout/impl/{IoOrderInvoiceServiceImpl.java => IoOrderInvoiceService.java} (81%) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index d4acef7f..40251efc 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -35,6 +35,7 @@ import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; 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 e0af8906..f836dc91 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -41,6 +41,7 @@ import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; import com.glxp.api.service.purchase.SupCertService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 18b9ef0d..1d2417ac 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -1,19 +1,27 @@ package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.req.inout.RefreshInoiceRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.RefreshInoiceResponse; import com.glxp.api.service.inout.IoOrderDetailCodeService; -import com.glxp.api.service.inout.IoOrderInvoiceService; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -46,4 +54,49 @@ public class IoOrderInvoiceController { return ResultVOUtils.error(500, "查无发票信息！"); return ResultVOUtils.success(response); } + + //分组查询发票列表 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/order/group/invoice") + public BaseResponse filterGroup(IoOrderInvoiceRequest orderInvoiceRequest) { + List orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest); + PageInfo pageInfo = new PageInfo<>(orderInvoiceEntities); + return ResultVOUtils.page(pageInfo); + } + + //发票对应产品信息汇总 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/invoice/product/detail") + public BaseResponse productDetail(IoOrderInvoiceRequest orderInvoiceRequest) { + if (StrUtil.isEmpty(orderInvoiceRequest.getInvoiceEncode())) + return ResultVOUtils.error(500, "发票编码不能为空！"); + List orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest); + PageInfo pageInfo = new PageInfo<>(orderInvoiceEntities); + return ResultVOUtils.page(pageInfo); + } + + //发票对应所有单据 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/invoice/order/detail") + public BaseResponse orderDetail(IoOrderInvoiceRequest orderInvoiceRequest) { + List orderInvoiceEntities = ioOrderInvoiceService.filterByInvoiceCode(orderInvoiceRequest); + PageInfo pageInfo = new PageInfo<>(orderInvoiceEntities); + return ResultVOUtils.page(pageInfo); + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/invoice/delete") + @Log(title = "发票删除", businessType = BusinessType.DELETE) + public BaseResponse deleteInvoice(@RequestBody DeleteRequest deleteRequest) { + if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) + return ResultVOUtils.error(500, "发票编码不能为空"); + + boolean b = ioOrderInvoiceService.remove(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); + if (b) + return ResultVOUtils.success("删除成功！"); + else + return ResultVOUtils.error(500, "删除失败！"); + } + + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java b/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java index 7f031495..bcda280a 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java @@ -4,6 +4,8 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.req.inout.IoOrderInvoiceRequest; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; +import com.glxp.api.res.inout.IoOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,4 +17,8 @@ public interface IoOrderInvoiceMapper extends BaseMapperPlus selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceEntity); + List filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest); + + + List filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest); } 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 07ee07cc..35c617fc 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.purchase.SupCertSetEntity; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.Date; @@ -17,7 +18,7 @@ import java.util.List; * @modyified By : */ @Data -public class IoOrderInvoiceRequest { +public class IoOrderInvoiceRequest extends ListPageRequest { private Long id; diff --git a/src/main/java/com/glxp/api/req/system/DeleteRequest.java b/src/main/java/com/glxp/api/req/system/DeleteRequest.java index 005102ef..dc14f613 100644 --- a/src/main/java/com/glxp/api/req/system/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/system/DeleteRequest.java @@ -11,4 +11,5 @@ public class DeleteRequest { List ids; String billNo; List billNos; + String invoiceEncode; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java index c9eab274..ca0a1670 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java @@ -9,7 +9,6 @@ import lombok.Data; import java.util.Date; @Data -@TableName(value = "io_order_invoice") public class IoOrderInvoiceResponse { private Long id; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index b9b4c649..4976dac1 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -16,6 +16,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.InvProductDetailService; import com.glxp.api.service.inv.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 80c3f8f0..b83a8a5b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -22,6 +22,7 @@ import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; import com.glxp.api.service.inv.InvPreinProductDetailService; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java deleted file mode 100644 index 836e73f4..00000000 --- a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.glxp.api.service.inout; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.inout.IoCodeRelEntity; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.entity.inout.IoOrderInvoiceEntity; -import com.glxp.api.req.inout.IoOrderInvoiceRequest; -import com.glxp.api.res.inout.IoOrderResponse; - -import java.util.List; - -public interface IoOrderInvoiceService extends IService { - - - List findByBillNo(String billNo); - - boolean deleteByInvId(String id); - - boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest); - - boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity); - - List selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest); - - // 更新发票状态 - boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity); - - IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse); - - boolean findRegStausByProduct(String billNo); -} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java similarity index 81% rename from src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java rename to src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index 2e3f1115..0f4d9b7c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -4,18 +4,18 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inout.IoCodeRelMapper; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.dao.inout.IoOrderInvoiceMapper; -import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.req.inout.IoOrderInvoiceRequest; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderResponse; +import org.apache.regexp.RE; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.glxp.api.service.inout.IoOrderInvoiceService; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -25,24 +25,22 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class IoOrderInvoiceServiceImpl extends ServiceImpl implements IoOrderInvoiceService { +public class IoOrderInvoiceService extends ServiceImpl { @Resource IoOrderInvoiceMapper ioOrderInvoiceMapper; @Resource IoOrderDetailCodeDao orderDetailCodeDao; - @Override + public List findByBillNo(String orderIdFk) { return ioOrderInvoiceMapper.selectList(new QueryWrapper().eq("orderIdFk", orderIdFk)); } - @Override public boolean deleteByInvId(String id) { return this.ioOrderInvoiceMapper.deleteById(id) > 0; } - @Override public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); @@ -50,32 +48,20 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl 0; } - @Override public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) { return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0; } - @Override public List selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) { return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest); } - @Override public boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity) { IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest(); orderInvoiceRequest.setBatchNo(orderDetailCodeEntity.getBatchNo()); orderInvoiceRequest.setBindRlFk(orderDetailCodeEntity.getBindRlFk() + ""); List orderInvoiceEntities = selectOrderInvoice(orderInvoiceRequest); if (CollUtil.isNotEmpty(orderInvoiceEntities)) { -// BigDecimal amount = new BigDecimal(0.00); -// for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { -// amount = amount.add(new BigDecimal(orderInvoiceEntity.getPrice())); -// } -// if (amount.compareTo(orderDetailCodeEntity.getPrice()) == 0) { -// orderDetailCodeEntity.setRegStatus(true); -// } else { -// orderDetailCodeEntity.setRegStatus(false); -// } orderDetailCodeEntity.setRegStatus(true); } else { orderDetailCodeEntity.setRegStatus(false); @@ -84,7 +70,6 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper().eq("orderIdFk", orderResponse.getBillNo())); List orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderResponse.getBillNo())); @@ -113,15 +98,33 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl0){ + else if (isAll > 0) { orderResponse.setInvoiceStatus(1);//未全部登记 } return orderResponse; } - @Override public boolean findRegStausByProduct(String billNo) { return false; } + + public List filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) { + if (orderInvoiceRequest.getPage() != null) { + int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); + PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit()); + } + return ioOrderInvoiceMapper.filterGroupBy(orderInvoiceRequest); + } + + + public List filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest) { + if (orderInvoiceRequest.getPage() != null) { + int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); + PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit()); + } + return ioOrderInvoiceMapper.filterByInvoiceCode(orderInvoiceRequest); + } + + } diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index fb6a2e68..1beeda9c 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -26,6 +26,7 @@ import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.purchase.*; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.util.CustomUtil; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index 3cc52948..c2e92f89 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -12,11 +12,11 @@ + + + + + + + + + From 26865894d035e502c34bb02b5c474b0d891c94a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 6 Jul 2023 16:23:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?UDIMS=E5=B9=B3=E5=8F=B0=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/LoginController.java | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 68ff4498..c7c68227 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -28,6 +28,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.service.auth.*; import com.glxp.api.util.*; +import com.glxp.api.vo.inv.InvWarehouseTreeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -316,7 +317,7 @@ public class LoginController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_CHANGE); } - //------------------------------------------UDIMS接口----------------------------------------------------------- + @Autowired private InvWarehouseDao invWarehouseDao; @@ -366,7 +367,6 @@ public class LoginController extends BaseController { return ResultVOUtils.success(authLicense1); } - @GetMapping("/spms/inv/warehouse/filterInv/forUdims") public BaseResponse forUdims() { FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest(); @@ -397,9 +397,6 @@ public class LoginController extends BaseController { } - - - @Value("${WEB_TITLE}") private String WEB_TITLE; @@ -410,4 +407,53 @@ public class LoginController extends BaseController { return ResultVOUtils.success(webTitleResponse); } + + + //------------------------------------------UDIMS接口----------------------------------------------------------- + /** + * 平台验证 + * + * @return + */ + @ResponseBody + @PostMapping(value = "/udims/verify") + public BaseResponse udimsVerify(@RequestBody Map params, + HttpServletRequest request) { + AuthAdmin authAdmin; + authAdmin = authAdminService.findByUserName(params.get("username").toString()); + if (authAdmin == null) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + + + if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + AuthLicense authLicense = new AuthLicense(); + if (params.get("appid") != null) { + authLicense = authLicenseDao.get(params.get("appid").toString()); + } else { + String appid = AppUtils.getAppid(); + authLicense.setId(appid); + authLicense.setAppid(appid); + authLicense.setApiKey(appid); + if (params.get("name") != null) + authLicense.setName(params.get("name").toString()); + authLicense.setSecretKey(AppUtils.getSecretKey(appid)); + authLicense.setCustomerId(authAdmin.getCustomerId() + ""); + CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId()); + authLicense.setCompanyName(companyEntity.getCompanyName()); + authLicense.setCreateDate(new Date()); + authLicenseDao.romveByCustomerId(authAdmin.getCustomerId() + ""); + authLicenseDao.save(authLicense); + } + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setSpUse(true); + List invList = invWarehouseDao.selectInvListTreeByUser(filterInvWarehouseRequest); + Map res = new WeakHashMap<>(2); + res.put("license", authLicense); + res.put("invList", invList); + return ResultVOUtils.success(res); + } + }