From eaa0c500114081638d485609c501e2f38ffca878 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 29 Jul 2024 14:31:42 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=97=A0=E6=89=B9=E6=AC=A1=E5=8F=B7?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=BB=98=E8=AE=A4=E8=B5=8B=E4=BA=88=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoAddInoutService.java | 27 +++++++++++++++++-- .../thrsys/impl/ThrInvOrderServiceImpl.java | 4 +-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 5c9412954..d3023eccd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -358,6 +358,29 @@ public class IoAddInoutService { } } } + } else if (StrUtil.isEmpty(bizEntity.getBatchNo())) { + List invProductEntities = invProductService.selectByRelId(bizEntity.getBindRlFk(), bizEntity.getSupId(), null, orderEntity.getInvCode()); + if (CollUtil.isNotEmpty(invProductEntities)) { + int count = 0; + for (InvProductEntity invProductEntity : invProductEntities) { + if (invProductEntity.getReCount() + count > IntUtil.value(bizEntity.getCount())) { + IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); + BeanUtils.copyProperties(bizEntity, orderDetailBizEntity); + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); + orderDetailBizEntity.setBatchNo(invProductEntity.getBatchNo()); + newBizList.add(orderDetailBizEntity); + break; + } else { + count = invProductEntity.getReCount(); + IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); + BeanUtils.copyProperties(bizEntity, orderDetailBizEntity); + orderDetailBizEntity.setCount(count); + orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); + orderDetailBizEntity.setBatchNo(invProductEntity.getBatchNo()); + newBizList.add(orderDetailBizEntity); + } + } + } } } @@ -368,7 +391,7 @@ public class IoAddInoutService { List codeTempEntities = new ArrayList<>(); - for (IoOrderDetailBizEntity bizEntity : bizEntities) { + for (IoOrderDetailBizEntity bizEntity : newBizList) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); String udiCode = "#" + bizEntity.getNameCode() + "#" + StrUtil.trimToEmpty(bizEntity.getProductDate()) @@ -398,7 +421,7 @@ public class IoAddInoutService { codeTempEntities.add(codeTempEntity); } codeTempService.insertBatch(codeTempEntities); - bizEntities.forEach(orderDetailBizEntity -> { + newBizList.forEach(orderDetailBizEntity -> { IoOrderDetailCodeEntity orderDetailCodeEntity = new IoOrderDetailCodeEntity(); BeanUtils.copyProperties(orderDetailBizEntity, orderDetailCodeEntity); orderDetailCodeEntity.setId(null); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 4d2327517..cb59153e6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -1348,7 +1348,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); parameterPackag(basicProductsEntity, ioOrderDetailBizEntity, thrInvOrderDetail); ioOrderDetailBizEntity.setOrderIdFk(newBillNo); - ioOrderDetailBizEntity.setBatchNo("/"); +// ioOrderDetailBizEntity.setBatchNo(); thrInvOrderDetail.setToBillNo(newBillNo); thrInvOrderDetail.setHandleStatus(1); newOrderDetailBiz.add(ioOrderDetailBizEntity); @@ -1511,7 +1511,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { List udiRlSupEntitys = udiRlSupService.findByUdiRlId(relId); if (CollUtil.isNotEmpty(udiRlSupEntitys)) { for (UdiRlSupEntity udiRlSupEntity : udiRlSupEntitys) { - Integer count1 = invProductService.selectExitCount("1000000", Long.parseLong(udiRlSupEntity.getCustomerId()), Long.parseLong(udiRlSupEntity.getUdiRlIdFk())); + Integer count1 = invProductService.selectExitCount(thrInvOrder.getInvCode(), Long.parseLong(udiRlSupEntity.getCustomerId()), Long.parseLong(udiRlSupEntity.getUdiRlIdFk())); if (IntUtil.value(count1 > 0)) { thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); if (udiRlSupEntity.getPrice() == null) From 08182d3d68004c7b369ff24059f8d9021b81fada Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 29 Jul 2024 15:52:07 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=BB=84=E5=A5=97=EF=BC=8C=E5=8D=95=E6=8D=AE=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 2 +- .../api/entity/basic/UdiProductEntity.java | 2 +- .../api/entity/basic/UdiRelevanceEntity.java | 7 + .../entity/thrsys/ThrProductsAddDiEntity.java | 5 +- .../basic/CompanyProductRelevanceRequest.java | 1 + .../api/req/basic/FilterUdiInfoRequest.java | 2 +- .../api/req/basic/FilterUdiRelRequest.java | 2 +- .../glxp/api/req/basic/SupplementRequest.java | 2 +- .../api/req/basic/UdiRelevanceRequest.java | 2 +- .../req/basic/UdiRelevanceSaveRequest.java | 2 +- .../inout/FilterOrderDetailResultRequest.java | 3 + .../req/thrsys/AddThrDiProductsRequest.java | 5 + .../req/thrsys/FilterThrProductsRequest.java | 1 + .../CompanyProductRelevanceResponse.java | 5 + .../api/res/basic/UdiRelevanceResponse.java | 2 +- .../glxp/api/res/basic/UdiRlSupResponse.java | 14 +- .../inout/IoOrderDetailResultResponse.java | 3 +- .../glxp/api/res/thrsys/UdiInfoResponse.java | 4 + .../thrsys/impl/ThrInvOrderServiceImpl.java | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 449 ++++++------- .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- .../mapper/inout/IoOrderDetailResultDao.xml | 23 +- src/main/resources/schemas/schema_v2.4.sql | 627 +++++++++++------- 23 files changed, 670 insertions(+), 497 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index a10281cd4..daeb26356 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -206,7 +206,7 @@ public class BasicOrderPrintController { for (IoCodeEntity obj : ioCodeEntityList) { //查询业务表 for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) { - if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) { + if (StrUtil.nullToEmpty(ioObj.getBatchNo()).equals(StrUtil.nullToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) { ioOrderDetailBizEntity = ioObj; break; } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 1181bef44..34bab34d7 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -140,5 +140,5 @@ public class UdiProductEntity { private Integer hcType; private Integer requireScanCode; - + private Boolean isStack; } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index f9a34e4df..fbda63274 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -206,4 +206,11 @@ public class UdiRelevanceEntity { @TableField(value = "newNeedUpload") private Boolean newNeedUpload; + + /** + * 是否组套 + */ + @TableField(value = "isStack") + private Boolean isStack; + } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java index 889f4602d..545d6d377 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.thrsys; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -69,7 +70,6 @@ public class ThrProductsAddDiEntity { private String basicPrductRemak8; - private String name; private String spec; private String registerNo; @@ -96,6 +96,7 @@ public class ThrProductsAddDiEntity { private String relId; private String nameCode; private Integer type; - + @TableField(value = "isStack") + private Integer isStack; } diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index d1684b3f1..526548b73 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -63,6 +63,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { * 耗材分类高值 :1:高值耗材;2.普通耗材 */ private Integer hcType; + private Boolean isStack; private String corpId; private String billType; private String manufactory; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index 8982e5ec9..b48a37b74 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -60,7 +60,7 @@ public class FilterUdiInfoRequest extends ListPageRequest { private Integer hcType; private String corpId; private String billType; - + private Boolean isStack; private String ybbm; private String sptm; private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询 diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index aade4731f..39bff6e72 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -65,7 +65,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private Integer hcType; private String corpId; private String billType; - + private Boolean isStack; private String ybbm; private String sptm; private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询 diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java index f79f72fe4..6f4149461 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -23,7 +23,7 @@ public class SupplementRequest { private String cpms; private String price; private Integer purType; - + private Boolean isStack; private String flbm; private String requireScanCode; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index e5a95178b..4ab469e2a 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -46,7 +46,7 @@ public class UdiRelevanceRequest { private String originUuid; private String price; private String modifyTime; //修改时间 - + private Boolean isStack; private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 private Integer zdcfsycs; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 4d4cfdc3f..22617300b 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -46,7 +46,7 @@ public class UdiRelevanceSaveRequest { private String createUser; private String updateUser; private String remark; - + private Boolean isStack; //UdiInfoEntity private String originUuid; private String nameCode; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index ee46b3c3f..3d3f4d110 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -48,6 +48,9 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String actionType; private String manufacturer; private String zczbhhzbapzbh; + private Boolean isStack; + private String invoiceEncode; + private String templateId; private List actions; private List list; diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java index 6e7fe528f..b5adca8f0 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java @@ -35,7 +35,12 @@ public class AddThrDiProductsRequest { private String cpms; private String price; private List selectThirdSys; + /** + * 产品分类高值 :1:高值耗材;2.普通耗材 + */ + private Integer hcType; + private Boolean isStack; private String basicPrductRemak1; private String basicPrductRemak2; private String basicPrductRemak3; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index e7e334b8d..335fe3cd8 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -35,6 +35,7 @@ public class FilterThrProductsRequest extends ListPageRequest { private String uuid; private Integer diType; private Integer type; + private Boolean isStack; public List getThrProductsEntities() { return thrProductsEntities; diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index 2bc415c44..d68f19f3f 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -94,4 +94,9 @@ public class CompanyProductRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + + private String cphhhbh; + + private Boolean isStack; + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index e0326fdae..42cc26b9f 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -144,7 +144,7 @@ public class UdiRelevanceResponse { * 系统新增需要上传 */ private Boolean newNeedUpload; - + private Boolean isStack; /** * 上传状态 0:未上传;1:已上传; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index d282aa1ef..abccfe05f 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -96,29 +96,33 @@ public class UdiRlSupResponse { * 一级分类名称(学科,品名) */ @TableField(value = "catalogname1") - @ApiModelProperty(value="一级分类名称(学科,品名)") + @ApiModelProperty(value = "一级分类名称(学科,品名)") private String catalogname1; /** * 二级分类名称(用途、品目) */ @TableField(value = "catalogname2") - @ApiModelProperty(value="二级分类名称(用途、品目)") + @ApiModelProperty(value = "二级分类名称(用途、品目)") private String catalogname2; /** * 三级分类名称(部位、功能、品种) */ @TableField(value = "catalogname3") - @ApiModelProperty(value="三级分类名称(部位、功能、品种)") + @ApiModelProperty(value = "三级分类名称(部位、功能、品种)") private String catalogname3; /** * 耗材材质 */ @TableField(value = "matrial") - @ApiModelProperty(value="耗材材质") + @ApiModelProperty(value = "耗材材质") private String matrial; - + /** + * 产品分类高值 :1:高值耗材;2.普通耗材 + */ + private Integer hcType; + private Boolean isStack; private Integer requireScanCode; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 7a3a3f53e..4d3f8e2c6 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -211,12 +211,13 @@ public class IoOrderDetailResultResponse { //金额 private BigDecimal amount; + private String invoiceEncode; @ExcelProperty(value = "发票确认时间", index = 12) private Date confirmTime; @ExcelProperty(value = "配送商", index = 7) private String corpName; - + private Boolean isStack; public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index a2b60e1c3..b11e23411 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -99,6 +99,10 @@ public class UdiInfoResponse { private String basicPrductRemak8; private String remark; + + private String matrial; + private Boolean isStack; + public Integer getId() { return id; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index cb59153e6..b91a4fe84 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -997,7 +997,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ioOrderEntity.setThrOrderIdFk(thrInvOrder.getBillNo());//单据号 ioOrderEntity.setUpdateTime(new Date()); if (thrInvOrder.getStartDate() != null) { - ioOrderEntity.setCreateTime(new Date()); + ioOrderEntity.setCreateTime(thrInvOrder.getStartDate()); } ioOrderEntity.setCustomerId("110"); Long userId = 1l; diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 5a7ed8d0c..1333ded13 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -558,7 +558,7 @@ basic_products.catalogname2, basic_products.catalogname3, basic_products.matrial, - basic_products.requireScanCode, + basic_products.requireScanCode, th.hsmc hslbName FROM basic_products inner JOIN basic_udirel @@ -1236,74 +1236,74 @@ replace - INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, - updateTime, modifyTime, - createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + INTO basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, + updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert, isStack) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack}) insert - ignore + ignore INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, - updateTime, modifyTime, - createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, + updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert, isStack) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack}) @@ -1431,6 +1431,9 @@ needCert=#{needCert}, + + isStack=#{isStack}, + WHERE id = #{id} @@ -1453,108 +1456,110 @@ replace - into basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, - modifyTime, - createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) - values + into basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, + updateTime, + modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert, isStack) + values (#{item.id}, - #{item.uuid}, - #{item.mainId}, - #{item.thirdId}, - #{item.thirdId1}, - #{item.thirdId2}, - #{item.thirdId3}, - #{item.thirdId4}, - #{item.udplatCode}, - #{item.isUseDy}, - #{item.isDisable}, - #{item.isLock}, - #{item.lockStatus}, - #{item.isAdavence},#{item.purType},#{item.attributeType},#{item.hcType}, - #{item.useMuti}, - #{item.useNum}, - #{item.supName}, - #{item.createTime}, - #{item.updateTime}, - #{item.modifyTime}, - #{item.createUser}, - #{item.updateUser}, - #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert}) + #{item.uuid}, + #{item.mainId}, + #{item.thirdId}, + #{item.thirdId1}, + #{item.thirdId2}, + #{item.thirdId3}, + #{item.thirdId4}, + #{item.udplatCode}, + #{item.isUseDy}, + #{item.isDisable}, + #{item.isLock}, + #{item.lockStatus}, + #{item.isAdavence}, #{item.purType}, #{item.attributeType}, #{item.hcType}, + #{item.useMuti}, + #{item.useNum}, + #{item.supName}, + #{item.createTime}, + #{item.updateTime}, + #{item.modifyTime}, + #{item.createUser}, + #{item.updateUser}, + #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert}, + #{item.isStack}) select basic_products.cpmctymc from basic_udirel - left join basic_products on basic_udirel.uuid = basic_products.uuid + left join basic_products on basic_udirel.uuid = basic_products.uuid where basic_udirel.id = #{relId} update - basic_udirel + basic_udirel set `relCode` = #{item.relCode} where id = #{item.id} @@ -1605,79 +1610,79 @@ SELECT a2.*, + aw.name as fromInvName, a1.mainAction, - a1.confirmTime as confirmTime, - a1.auditTime, - b1.NAME AS corpName, - (select name from auth_warehouse aw where aw.code = a1.fromInvCode) as fromInvName, - (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName + bu.isStack, + GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') AS invoiceCodes, + b1.NAME AS fromCorpName + , + basic_bussiness_type.name billTypeName FROM io_order_detail_result a2 LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp + LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id + left join basic_bussiness_type on a1.action = basic_bussiness_type.action + LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk left join auth_warehouse aw on aw.code = a1.fromInvCode - - a1.status = 7 @@ -57,9 +59,15 @@ AND a1.mainAction = #{mainAction} + + AND bu.isStack = #{isStack} + AND a1.invCode = #{invCode} + + AND ioi.invoiceEncode = #{invoiceEncode} + AND a2.spec like concat('%', #{spec}, '%') @@ -100,6 +108,7 @@ + group by a2.id SELECT a2.*, aw.name as fromInvName, + aw2.name as fromOutName, a1.mainAction, + a1.confirmTime, + a1.auditTime, bu.isStack, + bu.groupBuy, GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') AS invoiceCodes, - b1.NAME AS fromCorpName - , + b1.NAME AS fromCorpName, basic_bussiness_type.name billTypeName FROM io_order_detail_result a2 LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk + LEFT JOIN io_order a3 ON a3.ullageSupNo = a2.orderIdFk LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id left join basic_bussiness_type on a1.action = basic_bussiness_type.action LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk left join auth_warehouse aw on aw.code = a1.fromInvCode + left join auth_warehouse aw2 on aw2.code = a3.fromInvCode a1.status = 7 AND a2.orderIdFk = #{orderIdFk} + + AND bu.groupBuy = #{groupBuy} + AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%')) @@ -71,6 +79,9 @@ AND a2.spec like concat('%', #{spec}, '%') + + AND aw2.name like concat('%', #{fromOutName}, '%') + AND a1.fromCorp = #{fromCorp} From 4b6ac18da9bd4129bcf127d00f6de21176c98cd7 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 2 Aug 2024 14:18:51 +0800 Subject: [PATCH 11/18] =?UTF-8?q?feat:=20=E5=B8=A6=E7=A5=A8=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 1 - .../inout/FilterOrderDetailResultRequest.java | 1 - .../inout/IoOrderDetailResultResponse.java | 2 +- .../mapper/inout/IoOrderDetailResultDao.xml | 36 ++++++++----------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 8c2b669ff..89f55776c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -373,7 +373,6 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("isStack", ioOrderDetailResultResponse.getIsStack() == null ? ' ' : ioOrderDetailResultResponse.getIsStack()); ioOrderDetailResultData.put("groupBuy", ioOrderDetailResultResponse.getGroupBuy() == null ? ' ' : ioOrderDetailResultResponse.getGroupBuy()); ioOrderDetailResultData.put("invoiceCodes", ioOrderDetailResultResponse.getInvoiceCodes() == null ? ' ' : ioOrderDetailResultResponse.getInvoiceCodes()); - ioOrderDetailResultData.put("fromOutName", ioOrderDetailResultResponse.getFromOutName() == null ? ' ' : ioOrderDetailResultResponse.getFromOutName()); if (thrProductsEntity != null) { ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index 34185e09e..502761d1d 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -65,7 +65,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String confirmEndTime; //发票确认结束日期 private String corpName;//供应商名字 - private String fromOutName;//出库科室 private Boolean groupBuy; //是否集采产品 } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 47b0d886f..83c49f26a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -221,7 +221,7 @@ public class IoOrderDetailResultResponse { private Boolean isStack; private Boolean groupBuy; - private String fromOutName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) return fromCorpName; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 3e058416c..3afd30e08 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -25,25 +25,22 @@ + select *,aw.name invName,ad.name deptName + from sys_msg_todo smt + left join auth_warehouse aw on aw.code = smt.invCode + left join auth_dept ad on ad.code = smt.deptCode + + + and smt.msgType = #{msgType} + + + and smt.pushStatus = #{pushStatus} + + + and smt.dealStatus = #{dealStatus} + + + and smt.invCode = #{invCode} + + + and smt.deptCode = #{deptCode} + + + order by smt.createTime desc + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index f482a6189..d58bd0d91 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3874,3 +3874,21 @@ CALL Pro_Temp_ColumnWork('inv_remind_set', 'recentDateTime', CALL Pro_Temp_ColumnWork('inv_remind_set', 'isDateBy', ' tinyint(0) NULL DEFAULT 1 COMMENT ''时间预警填写类型1天2小时''', 1); + + +CREATE TABLE IF NOT EXISTS `sys_msg_todo` ( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '消息编码', + `msgType` tinyint DEFAULT NULL COMMENT '消息类型(1:入院物资申请;2:单据审核;3:单据发票确认;5.资质审核;6:领用单审核;7:申购单审核;8:采购订单审核;)', + `msgContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '消息内容', + `dealStatus` tinyint DEFAULT NULL COMMENT '处理状态', + `pushStatus` tinyint DEFAULT NULL COMMENT '推送小程序状态(1:未推送;2:推送成功;3:推送失败', + `toUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '跳转地址', + `createTime` datetime DEFAULT NULL COMMENT '创建时间', + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人', + `updateTime` datetime DEFAULT NULL COMMENT '更新时间', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '所属仓库', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '所属仓库', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; From a5c6d5b44e73ec42c97139b683eb421deb6b9b9c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 14 Aug 2024 17:04:56 +0800 Subject: [PATCH 18/18] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertRemindMsgController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java index a42ef4e9b..7f636139a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java @@ -1,12 +1,15 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; +import com.glxp.api.dao.purchase.SupCertRemindMsgDao; +import com.glxp.api.entity.purchase.SupCertRemindMsgEntity; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; import com.glxp.api.res.purchase.SupCertRemindMsgResponse; import com.glxp.api.service.purchase.SupCertRemindMsgService; @@ -40,6 +43,17 @@ public class SupCertRemindMsgController { return ResultVOUtils.page(pageInfo); } + + @Resource + private SupCertRemindMsgDao supCertRemindMsgDao; + + @GetMapping("/sup/cert/remind/msg/getCount") + public BaseResponse getCount(FilterCertRemindMsgRequest filterCertRemindMsgRequest) { + long count = supCertRemindMsgDao.selectCount(new LambdaQueryWrapper().eq(SupCertRemindMsgEntity::getStatus, 1)); + return ResultVOUtils.success(count); + } + + /** * 确认消息 *