From ce4ad583702111dbcb2df6e08f840b9096407fe5 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 3 Feb 2023 10:04:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84bug=202.=E5=90=88=E5=B9=B6=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=B1=BB=203.=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=85=B6=E4=BB=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 9 +- .../controller/inout/IoOrderController.java | 22 +++- .../controller/thrsys/ThrOrderController.java | 2 +- .../thrsys/ThrOrderExportLogController.java | 2 +- .../com/glxp/api/http/ErpOrderClient.java | 7 +- .../api/req/inout/FilterOrderRequest.java | 116 ++++++++++++++++++ .../api/req/thrsys/FilterOrderRequest.java | 36 ------ .../api/req/thrsys/FilterThrOrderRequest.java | 7 +- .../glxp/api/res/basic/CandidateRequest.java | 5 + .../impl/BasicBussinessTypeServiceImpl.java | 2 +- .../service/thrsys/ThrOrdersDlService.java | 9 +- .../mybatis/mapper/auth/AuthAdminDao.xml | 2 +- 12 files changed, 168 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java delete mode 100644 src/main/java/com/glxp/api/req/thrsys/FilterOrderRequest.java diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 61689c547..cdff9c6b0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -286,9 +286,14 @@ public class BasicBussinessTypeController extends BaseController { if (StrUtil.isBlank(candidateRequest.getMainAction())) { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } - List bussinessTypeEntities = basicBussinessTypeService.candidateBussinessType(candidateRequest.getMainAction()); + List list = basicBussinessTypeService.candidateBussinessType(candidateRequest.getMainAction()); + if (StrUtil.isNotBlank(candidateRequest.getCurAction())) { + //将此单据已经绑定的平衡补单单据类型添加到候选列表中 + BasicBussinessTypeEntity supplementType = basicBussinessTypeService.findByAction(candidateRequest.getCurAction()); + list.add(supplementType); + } //查询补单单据类型 - return ResultVOUtils.success(bussinessTypeEntities); + return ResultVOUtils.success(list); } /** 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 14127f015..6d318ee64 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1,12 +1,15 @@ package com.glxp.api.controller.inout; import com.glxp.api.annotation.AuthRuleAnnotation; +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.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.inout.IoOrderService; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +22,24 @@ import java.util.List; public class IoOrderController { @Resource - IoOrderService orderService; + private IoOrderService orderService; + + /** + * 查询单据列表 + * + * @param filterOrderRequest + * @param bindingResult + * @return + */ + @GetMapping("/udiwms/inout/order/filter") + public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + return ResultVOUtils.success(); + } @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/draft") diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 44f9a3d0a..38786d227 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -355,7 +355,7 @@ public class ThrOrderController { } //只查询第三方单据 @GetMapping("/udiwms/thirdOrder/filter") - public BaseResponse filterThirdOrder(FilterOrderRequest filterErpOrderRequest, + public BaseResponse filterThirdOrder(FilterThrOrderRequest filterErpOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 08b4da607..c0a7e81ba 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -162,7 +162,7 @@ public class ThrOrderExportLogController { //第三方业务单据接口下载（第三方使用） @GetMapping("/udiwms/thrsys/thrOrder/download") - public BaseResponse downloadThrOrders(FilterOrderRequest filterErpOrderRequest, + public BaseResponse downloadThrOrders(FilterThrOrderRequest filterErpOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/http/ErpOrderClient.java b/src/main/java/com/glxp/api/http/ErpOrderClient.java index 239d1111d..2d98b6321 100644 --- a/src/main/java/com/glxp/api/http/ErpOrderClient.java +++ b/src/main/java/com/glxp/api/http/ErpOrderClient.java @@ -5,10 +5,9 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.req.thrsys.FilterOrderRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrErpOrderResponse; - import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrSystemService; import lombok.extern.slf4j.Slf4j; @@ -45,7 +44,7 @@ public class ErpOrderClient { return erpOrderEntities; } - public BaseResponse> getThrOrderResponse(FilterOrderRequest filterOrderRequest) { + public BaseResponse> getThrOrderResponse(FilterThrOrderRequest filterOrderRequest) { //查询第三方服务授权参数 ThrSystemEntity thrSystemEntity = thrSystemService.selectByThirdId("thirdId"); @@ -62,7 +61,7 @@ public class ErpOrderClient { return null; } - public List getErpOrder(FilterOrderRequest filterOrderRequest) { + public List getErpOrder(FilterThrOrderRequest filterOrderRequest) { try { BaseResponse> responseBaseResponse = getThrOrderResponse(filterOrderRequest); List purchaseinResponseList = responseBaseResponse.getData().getList(); diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java new file mode 100644 index 000000000..2d0887f27 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -0,0 +1,116 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterOrderRequest extends ListPageRequest { + + /** + * 单据ID + */ + private String id; + + /** + * 业务类型 + */ + private String action; + + /** + * 主业务类型 + */ + private String mainAction; + + /** + * 码 + */ + private String code; + + /** + * 单据状态 + */ + private Integer status; + + /** + * 手持终端订单号 + */ + private String corpOrderId; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; + + /** + * 往来单位 + */ + private String fromCorp; + + private String customerId; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据流转下级单号 + */ + private String ullageSupNo; + + /** + * 单据流转上级单号 + */ + private String originUllageSupNo; + + /** + * 创建人 + */ + private Integer createUser; + + /** + * 验收人 + */ + private Integer reviewUser; + + /** + * 用户ID + */ + private Integer userId; + + private String lastUpdateTime; + + /** + * 第三方单号 + */ + private String thirdBillNo; + + private String wmsUserId; + private String wmsUserName; + + /** + * 往来部门 + */ + private String fromDeptCode; + + /** + * 往来仓库 + */ + private String fromInvCode; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterOrderRequest.java deleted file mode 100644 index 434786ba5..000000000 --- a/src/main/java/com/glxp/api/req/thrsys/FilterOrderRequest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.glxp.api.req.thrsys; - -import lombok.Data; - -@Data -public class FilterOrderRequest { - private Integer id; - private String startDate; //起始日期 - private String endDate; //结束日期 - private String billNo; //单据号 - private String billFlag; //单据状态,0.未签字，1.已签字 - private String billAction; - private String corpName; - private Integer limit; - private Integer page; - private String originType; - private String customerId; - private String status; - - private Boolean isDownThrSys; - private Boolean isLocal; - private String localAction; - private String locStorageCode; - private String invWarehouseCode; - //第三方系统ID - private String thirdSys; - private Integer editStatus; - - private String action; - private String thirdAction; - private String thirdOrderFk; - - private Integer type; - private Integer allocateStatus; - -} diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index 27543d58e..dc51f5d07 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -21,12 +21,17 @@ public class FilterThrOrderRequest extends ListPageRequest { private String unitIdFk; private String originType; private String status; - + private String customerId; + private Boolean isDownThrSys; + private Boolean isLocal; private String thirdSys; private Integer editStatus; private String lastUpdateTime; private Integer thirdPartyDate; private Integer type; + private String action; + private String thirdAction; + private String thirdOrderFk; private Integer allocateStatus; private List erpOrderResponses; } diff --git a/src/main/java/com/glxp/api/res/basic/CandidateRequest.java b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java index 9c54a6bc2..bd777f66f 100644 --- a/src/main/java/com/glxp/api/res/basic/CandidateRequest.java +++ b/src/main/java/com/glxp/api/res/basic/CandidateRequest.java @@ -13,4 +13,9 @@ public class CandidateRequest { */ String mainAction; + /** + * 当前单据绑定的平衡补单单据类型 + */ + private String curAction; + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 53b4b4998..c676b4318 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -166,7 +166,7 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService @Override public boolean checkBusTypeNameExists(String name, Integer id) { - List list = basicBussinessTypeDao.selectList(new QueryWrapper().select("name", "id").eq("name", name).eq(null != id, "id", id)); + List list = basicBussinessTypeDao.selectList(new QueryWrapper().select("name", "id").eq("name", name)); if (CollUtil.isEmpty(list)) { return false; } else { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 265ecc874..d3627f0e2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -10,7 +10,10 @@ import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.ErpOrderClient; import com.glxp.api.http.HttpOkClient; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.req.thrsys.PostThrOrderRequest; +import com.glxp.api.req.thrsys.ThrOrderExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.system.SyncDataSetService; @@ -498,7 +501,7 @@ public class ThrOrdersDlService { filterThrOrderRequest.setPage(page); filterThrOrderRequest.setLimit(limit); filterThrOrderRequest.setBillAction(action); - FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + FilterThrOrderRequest filterOrderRequest = new FilterThrOrderRequest(); BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); BaseResponse> responseBaseResponse = erpOrderClient.getThrOrderResponse(filterOrderRequest); if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { @@ -617,7 +620,7 @@ public class ThrOrdersDlService { public List getThrOrders(int page, int limit, String orderQueryUrl, FilterThrOrderRequest filterThrOrderRequest) { - FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + FilterThrOrderRequest filterOrderRequest = new FilterThrOrderRequest(); BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); filterOrderRequest.setPage(page); filterOrderRequest.setLimit(limit); diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index eb60661c2..01fd314c4 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -6,7 +6,7 @@ From f88afd8001a18a4e16d47e301f7c948a05bae85b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 3 Feb 2023 14:08:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicProductsExportLogEntity.java | 95 +++++++++++++++ .../BasicProductsImportDetailEntity.java | 115 ++++++++++++++++++ .../basic/BasicProductsImportLogEntity.java | 80 ++++++++++++ 3 files changed, 290 insertions(+) create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicProductsExportLogEntity.java create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsExportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsExportLogEntity.java new file mode 100644 index 000000000..758ea8aeb --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsExportLogEntity.java @@ -0,0 +1,95 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "basic_products_export_log") +public class BasicProductsExportLogEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 生成日志记录 + */ + @TableField(value = "genKey") + private String genKey; + + /** + * 生成状态0：失败；1：成功 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 下载次数 + */ + @TableField(value = "dlCount") + private Integer dlCount; + + /** + * 文件下载路径 + */ + @TableField(value = "filePath") + private String filePath; + + @TableField(value = "`type`") + private Integer type; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_GENKEY = "genKey"; + + public static final String COL_STATUS = "status"; + + public static final String COL_DLCOUNT = "dlCount"; + + public static final String COL_FILEPATH = "filePath"; + + public static final String COL_TYPE = "type"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java new file mode 100644 index 000000000..51d9ebd11 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java @@ -0,0 +1,115 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.Data; + +@Data +@TableName(value = "basic_products_import_detail") +public class BasicProductsImportDetailEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + @TableField(value = "udiCode") + private String udiCode; + + @TableField(value = "ybbm") + private String ybbm; + + @TableField(value = "sptm") + private String sptm; + + @TableField(value = "thirdId1") + private String thirdId1; + + @TableField(value = "thirdId2") + private String thirdId2; + + @TableField(value = "thirdId3") + private String thirdId3; + + @TableField(value = "thirdId4") + private String thirdId4; + + @TableField(value = "thirdId") + private String thirdId; + + /** + * 0:等待处理，1.处理失败。2。处理成功 + */ + @TableField(value = "`status`") + private Integer status; + + @TableField(value = "genKeyFk") + private String genKeyFk; + + @TableField(value = "isUseDy") + private String isUseDy; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_UDICODE = "udiCode"; + + public static final String COL_YBBM = "ybbm"; + + public static final String COL_SPTM = "sptm"; + + public static final String COL_THIRDID1 = "thirdId1"; + + public static final String COL_THIRDID2 = "thirdId2"; + + public static final String COL_THIRDID3 = "thirdId3"; + + public static final String COL_THIRDID4 = "thirdId4"; + + public static final String COL_THIRDID = "thirdId"; + + public static final String COL_STATUS = "status"; + + public static final String COL_GENKEYFK = "genKeyFk"; + + public static final String COL_ISUSEDY = "isUseDy"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java new file mode 100644 index 000000000..a13054ba9 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java @@ -0,0 +1,80 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.Data; + +@Data +@TableName(value = "basic_products_import_log") +public class BasicProductsImportLogEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + @TableField(value = "genKey") + private String genKey; + + /** + * 0:正在导入，1.正在处理，2.处理异常。3.处理完成 + */ + @TableField(value = "`status`") + private Integer status; + + @TableField(value = "fromType") + private String fromType; + + @TableField(value = "thirdSysFk") + private String thirdSysFk; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_GENKEY = "genKey"; + + public static final String COL_STATUS = "status"; + + public static final String COL_FROMTYPE = "fromType"; + + public static final String COL_THIRDSYSFK = "thirdSysFk"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file From 33417f58cba06550ab8d8cc3e32093ad73251c7b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 3 Feb 2023 14:20:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/thrsys/ThrInvWarehouseController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 261b01184..ba6002707 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -36,12 +36,12 @@ public class ThrInvWarehouseController { @GetMapping("/thirdSys/sub/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { - List ThrInvWarehouseResponses = thrInvWarehouseService.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(ThrInvWarehouseResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + List thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(ThrInvWarehouseResponses); + pageSimpleResponse.setList(thrInvWarehouseEntities); return ResultVOUtils.success(pageSimpleResponse); } From 24b711893d1f299993bcbe92d694d42b5e3373bd Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 3 Feb 2023 14:45:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/basic/BasicProductsEntity.java | 464 ++++++++++++++++++ .../basic/CompanyProductRelevanceEntity.java | 113 +++++ 2 files changed, 577 insertions(+) create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java create mode 100644 src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java new file mode 100644 index 000000000..965edb9b9 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -0,0 +1,464 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "basic_products") +public class BasicProductsEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * UUID + */ + @TableField(value = "uuid") + private String uuid; + + /** + * 同步库原UUID + */ + @TableField(value = "originUuid") + private String originUuid; + + /** + * 最小销售产品标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 产品记录key（国家库） + */ + @TableField(value = "deviceRecordKey") + private String deviceRecordKey; + + /** + * 包装比例 + */ + @TableField(value = "packRatio") + private String packRatio; + + /** + * 包装单位 + */ + @TableField(value = "packUnit") + private String packUnit; + + /** + * 包装级别 + */ + @TableField(value = "packLevel") + private String packLevel; + + /** + * 包含下级数量 + */ + @TableField(value = "bhxjsl") + private Integer bhxjsl; + + /** + * 包含最小销售包装数量 + */ + @TableField(value = "bhzxxsbzsl") + private Integer bhzxxsbzsl; + + /** + * 最小包装单元内包含使用单元数量: +最小销售标识包含使用单元数量 + */ + @TableField(value = "zxxsbzbhsydysl") + private Integer zxxsbzbhsydysl; + + /** + * 包含下级产品编码 + */ + @TableField(value = "bhxjcpbm") + private String bhxjcpbm; + + /** + * 包装层级 + */ + @TableField(value = "bzcj") + private String bzcj; + + /** + * 产品名称，通用名称 + */ + @TableField(value = "cpmctymc") + private String cpmctymc; + + /** + * 产品类别 + */ + @TableField(value = "cplb") + private String cplb; + + /** + * 分类编码 + */ + @TableField(value = "flbm") + private String flbm; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 器械类别 + */ + @TableField(value = "qxlb") + private String qxlb; + + /** + * 统一社会信用代码证号 + */ + @TableField(value = "tyshxydm") + private String tyshxydm; + + /** + * 注册/备案人名称 + */ + @TableField(value = "ylqxzcrbarmc") + private String ylqxzcrbarmc; + + /** + * "注册/备案证号， + */ + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + + /** + * 注册/备案人名称英文名称 + */ + @TableField(value = "ylqxzcrbarywmc") + private String ylqxzcrbarywmc; + + /** + * 使用单元产品标识 + */ + @TableField(value = "sydycpbs") + private String sydycpbs; + + /** + * 上级产品标识 + */ + @TableField(value = "sjcpbm") + private String sjcpbm; + + /** + * 历史版本号，最高为最新 + */ + @TableField(value = "versionNumber") + private Integer versionNumber; + + /** + * 表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识 + */ + @TableField(value = "diType") + private Byte diType; + + /** + * 医保编码 + */ + @TableField(value = "ybbm") + private String ybbm; + + /** + * 商品条码 + */ + @TableField(value = "sptm") + private String sptm; + + /** + * 生产厂家 + */ + @TableField(value = "manufactory") + private String manufactory; + + /** + * 计量单位 + */ + @TableField(value = "measname") + private String measname; + + /** + * 0:UDI，1：第三方产品编码 + */ + @TableField(value = "productType") + private Byte productType; + + /** + * 是否包含批号 + */ + @TableField(value = "scbssfbhph") + private String scbssfbhph; + + /** + * 是否包含序列号 + */ + @TableField(value = "scbssfbhxlh") + private String scbssfbhxlh; + + /** + * 是否包含生产日期 + */ + @TableField(value = "scbssfbhscrq") + private String scbssfbhscrq; + + /** + * 是否包含失效日期 + */ + @TableField(value = "scbssfbhsxrq") + private String scbssfbhsxrq; + + /** + * 产品描述 + */ + @TableField(value = "cpms") + private String cpms; + + /** + * 是否允许无批次号扫码 + */ + @TableField(value = "allowNoBatch") + private Byte allowNoBatch; + + /** + * 是否允许无生产日期扫码 + */ + @TableField(value = "allowNoExpire") + private Byte allowNoExpire; + + /** + * 是否允许无失效日期扫码 + */ + @TableField(value = "allowNoProduct") + private Byte allowNoProduct; + + /** + * 商品名称 + */ + @TableField(value = "spmc") + private String spmc; + + /** + * 产品类型（器械类别） + */ + @TableField(value = "cplx") + private String cplx; + + /** + * 耗材或者设备（产品类别） + */ + @TableField(value = "hchzsb") + private String hchzsb; + + /** + * 代理商 + */ + @TableField(value = "cpdls") + private String cpdls; + + /** + * 价格 + */ + @TableField(value = "price") + private Long price; + + /** + * 备注字段1 + */ + @TableField(value = "basicPrductRemak1") + private String basicPrductRemak1; + + /** + * 备注字段2 + */ + @TableField(value = "basicPrductRemak2") + private String basicPrductRemak2; + + /** + * 备注字段3 + */ + @TableField(value = "basicPrductRemak3") + private String basicPrductRemak3; + + /** + * 备注字段4 + */ + @TableField(value = "basicPrductRemak4") + private String basicPrductRemak4; + + /** + * 备注字段5 + */ + @TableField(value = "basicPrductRemak5") + private String basicPrductRemak5; + + /** + * 备注字段6 + */ + @TableField(value = "basicPrductRemak6") + private String basicPrductRemak6; + + /** + * 备注字段7 + */ + @TableField(value = "basicPrductRemak7") + private String basicPrductRemak7; + + /** + * 备注字段8 + */ + @TableField(value = "basicPrductRemak8") + private String basicPrductRemak8; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 最後更新時間 + */ + @TableField(value = "updateTime") + private String updateTime; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_UUID = "uuid"; + + public static final String COL_ORIGINUUID = "originUuid"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_DEVICERECORDKEY = "deviceRecordKey"; + + public static final String COL_PACKRATIO = "packRatio"; + + public static final String COL_PACKUNIT = "packUnit"; + + public static final String COL_PACKLEVEL = "packLevel"; + + public static final String COL_BHXJSL = "bhxjsl"; + + public static final String COL_BHZXXSBZSL = "bhzxxsbzsl"; + + public static final String COL_ZXXSBZBHSYDYSL = "zxxsbzbhsydysl"; + + public static final String COL_BHXJCPBM = "bhxjcpbm"; + + public static final String COL_BZCJ = "bzcj"; + + public static final String COL_CPMCTYMC = "cpmctymc"; + + public static final String COL_CPLB = "cplb"; + + public static final String COL_FLBM = "flbm"; + + public static final String COL_GGXH = "ggxh"; + + public static final String COL_QXLB = "qxlb"; + + public static final String COL_TYSHXYDM = "tyshxydm"; + + public static final String COL_YLQXZCRBARMC = "ylqxzcrbarmc"; + + public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; + + public static final String COL_YLQXZCRBARYWMC = "ylqxzcrbarywmc"; + + public static final String COL_SYDYCPBS = "sydycpbs"; + + public static final String COL_SJCPBM = "sjcpbm"; + + public static final String COL_VERSIONNUMBER = "versionNumber"; + + public static final String COL_DITYPE = "diType"; + + public static final String COL_YBBM = "ybbm"; + + public static final String COL_SPTM = "sptm"; + + public static final String COL_MANUFACTORY = "manufactory"; + + public static final String COL_MEASNAME = "measname"; + + public static final String COL_PRODUCTTYPE = "productType"; + + public static final String COL_SCBSSFBHPH = "scbssfbhph"; + + public static final String COL_SCBSSFBHXLH = "scbssfbhxlh"; + + public static final String COL_SCBSSFBHSCRQ = "scbssfbhscrq"; + + public static final String COL_SCBSSFBHSXRQ = "scbssfbhsxrq"; + + public static final String COL_CPMS = "cpms"; + + public static final String COL_ALLOWNOBATCH = "allowNoBatch"; + + public static final String COL_ALLOWNOEXPIRE = "allowNoExpire"; + + public static final String COL_ALLOWNOPRODUCT = "allowNoProduct"; + + public static final String COL_SPMC = "spmc"; + + public static final String COL_CPLX = "cplx"; + + public static final String COL_HCHZSB = "hchzsb"; + + public static final String COL_CPDLS = "cpdls"; + + public static final String COL_PRICE = "price"; + + public static final String COL_BASICPRDUCTREMAK1 = "basicPrductRemak1"; + + public static final String COL_BASICPRDUCTREMAK2 = "basicPrductRemak2"; + + public static final String COL_BASICPRDUCTREMAK3 = "basicPrductRemak3"; + + public static final String COL_BASICPRDUCTREMAK4 = "basicPrductRemak4"; + + public static final String COL_BASICPRDUCTREMAK5 = "basicPrductRemak5"; + + public static final String COL_BASICPRDUCTREMAK6 = "basicPrductRemak6"; + + public static final String COL_BASICPRDUCTREMAK7 = "basicPrductRemak7"; + + public static final String COL_BASICPRDUCTREMAK8 = "basicPrductRemak8"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java new file mode 100644 index 000000000..9f8e773f9 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java @@ -0,0 +1,113 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +@Data +@TableName(value = "company_product_relevance") +public class CompanyProductRelevanceEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 客户ID + */ + @TableField(value = "customerId") + private String customerId; + + @TableField(value = "productId") + private String productId; + + @TableField(value = "enterpriseId") + private String enterpriseId; + + @TableField(value = "registrationId") + private String registrationId; + + /** + * 审核状态 1：通过，2：不通过，3：反审 + */ + @TableField(value = "auditStatus") + private String auditStatus; + + /** + * 产品UUID + */ + @TableField(value = "productUuid") + private String productUuid; + + /** + * 基础信息维护表关联主键 + */ + @TableField(value = "udiRlIdFk") + private Long udiRlIdFk; + + /** + * 往来单位ID外键 + */ + @TableField(value = "unitFk") + private String unitFk; + + /** + * 价格 + */ + @TableField(value = "price") + private BigDecimal price; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + public static final String COL_ID = "id"; + + public static final String COL_CUSTOMERID = "customerId"; + + public static final String COL_PRODUCTID = "productId"; + + public static final String COL_ENTERPRISEID = "enterpriseId"; + + public static final String COL_REGISTRATIONID = "registrationId"; + + public static final String COL_AUDITSTATUS = "auditStatus"; + + public static final String COL_PRODUCTUUID = "productUuid"; + + public static final String COL_UDIRLIDFK = "udiRlIdFk"; + + public static final String COL_UNITFK = "unitFk"; + + public static final String COL_PRICE = "price"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; +} \ No newline at end of file From 85794c2162b9212a5e9dbc2b2c744df2a8653bdc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 3 Feb 2023 15:09:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrInvWarehouseController.java | 17 +++++++++++++---- .../mapper/thrsys/ThrInvWarehouseDao.xml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index ba6002707..27d23c1b8 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -89,7 +89,7 @@ public class ThrInvWarehouseController { @AuthRuleAnnotation("") @PostMapping("/thirdSys/sub/inv/warehouse/edit") public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity, - BindingResult bindingResult) { + BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest ) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -97,9 +97,18 @@ public class ThrInvWarehouseController { if (invSubWarehouseEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - boolean b = thrInvWarehouseService.updateThrInvWarehouse(invSubWarehouseEntity); - if (!b) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + //先判断该部门下存不存在此仓库 + filterThrSubInvWarehouseRequest.setCode(invSubWarehouseEntity.getCode()); + filterThrSubInvWarehouseRequest.setName(invSubWarehouseEntity.getName()); + filterThrSubInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId()); + List thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); + if(thrInvWarehouseEntities.size()==0){ + boolean b = thrInvWarehouseService.updateThrInvWarehouse(invSubWarehouseEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + }else{ + return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getThirdSysFk()); diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index cb96ee4a2..924e5a476 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -2,7 +2,7 @@ -