From 778258acec8e91fb3804b00ed7c7cb1d596f3fb3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 12 Mar 2024 18:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 18 +- .../controller/basic/BasicCorpController.java | 10 +- .../thrsys/ThrInvOrderController.java | 3 +- .../glxp/api/entity/thrsys/ThrInvOrder.java | 2 + .../thrsys/ThrInvOrderDetailEntity.java | 205 ------- .../api/entity/thrsys/ThrInvOrderEntity.java | 132 ---- .../entity/thrsys/ThrSystemBusApiEntity.java | 4 + .../api/res/thrsys/ThrInvOrderResponse.java | 114 ++++ .../basic/impl/BasicDestinyRelService.java | 1 + .../service/thrsys/ThrInvOrderService.java | 9 +- .../thrsys/impl/ThrInvOrderServiceImpl.java | 72 ++- src/main/resources/application-dev.yml | 2 +- .../mapper/basic/BasicBussinessTypeDao.xml | 2 +- .../mapper/thrsys/ThrInvOrderMapper.xml | 574 +++++++++--------- .../mapper/thrsys/ThrSystemBusApiDao.xml | 17 +- src/main/resources/schemas/schema_v2.4.sql | 5 + 16 files changed, 487 insertions(+), 683 deletions(-) delete mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java delete mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java create mode 100644 src/main/java/com/glxp/api/res/thrsys/ThrInvOrderResponse.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 763213081..3203ab37f 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -231,7 +231,7 @@ public class BasicBussinessTypeController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/orderDetail/busTypesOptimize") public BaseResponse orderDetailBusTypesOptimize(FilterBussinessTypeRequest bussinessTypeRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { String detailType = bussinessTypeRequest.getDetailType(); List bussinessTypeResponses = new ArrayList<>(); @@ -244,8 +244,8 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeRequest.setCode(invWarehouseEntity.getCode()); } bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest); - List reList = bussinessTypeResponses.stream().map(s-> { - DictDto dictDto = new DictDto(s.getAction(),s.getName()); + List reList = bussinessTypeResponses.stream().map(s -> { + DictDto dictDto = new DictDto(s.getAction(), s.getName()); return dictDto; }).collect(Collectors.toList()); @@ -315,8 +315,8 @@ public class BasicBussinessTypeController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterJoinByUserOptimize") public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest, - BindingResult bindingResult) { - List reList = new ArrayList<>(); + BindingResult bindingResult) { + List reList = new ArrayList<>(); if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { List result = new ArrayList<>(); List bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType()); @@ -341,8 +341,8 @@ public class BasicBussinessTypeController extends BaseController { result.addAll(bussinessTypeEntities); } - reList = result.stream().map(s-> { - DictDto dictDto = new DictDto(s.getAction(),s.getName()); + reList = result.stream().map(s -> { + DictDto dictDto = new DictDto(s.getAction(), s.getName()); return dictDto; }).collect(Collectors.toList()); } else { @@ -353,8 +353,8 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeFilterRequest); - reList = bussinessTypeEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getAction(),s.getName()); + reList = bussinessTypeEntities.stream().map(s -> { + DictDto dictDto = new DictDto(s.getAction(), s.getName()); return dictDto; }).collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 5b9df5354..3b6dac8bf 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -92,7 +92,7 @@ public class BasicCorpController extends BaseController { @GetMapping("/udiwms/basic/unit/maintain/filterOptimize") public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -101,8 +101,8 @@ public class BasicCorpController extends BaseController { basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - List reList = basicUnitMaintainEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getErpId(),s.getName()); + List reList = basicUnitMaintainEntities.stream().map(s -> { + DictDto dictDto = new DictDto(s.getErpId(), s.getName()); return dictDto; }).collect(Collectors.toList()); @@ -575,8 +575,8 @@ public class BasicCorpController extends BaseController { public BaseResponse selectCorpListOptimize(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { List getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest); - List reList = getCorpList.stream().map(s-> { - DictDto dictDto = new DictDto(s.getErpId(),s.getName()); + List reList = getCorpList.stream().map(s -> { + DictDto dictDto = new DictDto(s.getErpId(), s.getName()); return dictDto; }).collect(Collectors.toList()); return ResultVOUtils.success(reList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java index 540ccb558..65c69b461 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -162,8 +162,7 @@ public class ThrInvOrderController { */ @PostMapping("/udiwms/thrsys/downloadInvOrder") public BaseResponse downloadInvOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { - thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest); - return ResultVOUtils.success(); + return thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest); } /** diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrder.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrder.java index ac3e214bc..bb8651282 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrder.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrder.java @@ -118,6 +118,8 @@ public class ThrInvOrder implements Serializable { */ private Integer skProject; + private String fromCorp; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java deleted file mode 100644 index 08fef49fc..000000000 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetailEntity.java +++ /dev/null @@ -1,205 +0,0 @@ -package com.glxp.api.entity.thrsys; - -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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import lombok.Data; - -@ApiModel(value="com-glxp-api-entity-thrsys-ThrInvOrderDetail") -@Data -@TableName(value = "thr_inv_order_detail") -public class ThrInvOrderDetailEntity implements Serializable { - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") - private Integer id; - - /** - * 单据号 - */ - @TableField(value = "orderIdFk") - @ApiModelProperty(value="单据号") - private String orderIdFk; - - /** - * 产品通用名称 - */ - @TableField(value = "cpmctymc") - @ApiModelProperty(value="产品通用名称") - private String cpmctymc; - - /** - * 物资字典主键 - */ - @TableField(value = "relId") - @ApiModelProperty(value="物资字典主键") - private Integer relId; - - /** - * 第三方项目编码/耗材字典 - */ - @TableField(value = "thrCode") - @ApiModelProperty(value="第三方项目编码/耗材字典") - private String thrCode; - - /** - * DI - */ - @TableField(value = "nameCode") - @ApiModelProperty(value="DI") - private String nameCode; - - /** - * 规格型号 - */ - @TableField(value = "ggxh") - @ApiModelProperty(value="规格型号") - private String ggxh; - - /** - * 批次号 - */ - @TableField(value = "batchNo") - @ApiModelProperty(value="批次号") - private Integer batchNo; - - /** - * 计量单位 - */ - @TableField(value = "measname") - @ApiModelProperty(value="计量单位") - private String measname; - - /** - * 价格 - */ - @TableField(value = "price") - @ApiModelProperty(value="价格") - private BigDecimal price; - - /** - * 生产日期 - */ - @TableField(value = "productionDate") - @ApiModelProperty(value="生产日期") - private Date productionDate; - - /** - * 失效日期 - */ - @TableField(value = "expireDate") - @ApiModelProperty(value="失效日期") - private Date expireDate; - - /** - * 医疗器械注册备案人 - */ - @TableField(value = "ylqxzcrbarmc") - @ApiModelProperty(value="医疗器械注册备案人") - private String ylqxzcrbarmc; - - /** - * 注册/备案号 - */ - @TableField(value = "zczbhhzbapzbh") - @ApiModelProperty(value="注册/备案号") - private String zczbhhzbapzbh; - - /** - * 入库数量 - */ - @TableField(value = "inCount") - @ApiModelProperty(value="入库数量") - private String inCount; - - /** - * 出库数量 - */ - @TableField(value = "outCount") - @ApiModelProperty(value="出库数量") - private String outCount; - - /** - * 供应商 - */ - @TableField(value = "supName") - @ApiModelProperty(value="供应商") - private String supName; - - /** - * 部门 - */ - @TableField(value = "deptName") - @ApiModelProperty(value="部门") - private String deptName; - - /** - * 部门编码 - */ - @TableField(value = "deptCode") - @ApiModelProperty(value="部门编码") - private String deptCode; - - /** - * 仓库 - */ - @TableField(value = "invName") - @ApiModelProperty(value="仓库") - private String invName; - - /** - * 仓库编码 - */ - @TableField(value = "invCode") - @ApiModelProperty(value="仓库编码") - private String invCode; - - /** - * 货位 - */ - @TableField(value = "spaceCode") - @ApiModelProperty(value="货位") - private String spaceCode; - - /** - * 货位编码 - */ - @TableField(value = "spaceName") - @ApiModelProperty(value="货位编码") - private String spaceName; - - /** - * 实际数量 - */ - @TableField(value = "reCount") - @ApiModelProperty(value="实际数量") - private String reCount; - - /** - * 出入库类型 - */ - @TableField(value = "mainAction") - @ApiModelProperty(value="出入库类型") - private String mainAction; - - /** - * 生产企业 - */ - @TableField(value = "manufacturer") - @ApiModelProperty(value="生产企业") - private String manufacturer; - - /** - * 备注 - */ - @TableField(value = "remark") - @ApiModelProperty(value="备注") - private String remark; - - private static final long serialVersionUID = 1L; -} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java deleted file mode 100644 index 6d5af1848..000000000 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderEntity.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.glxp.api.entity.thrsys; - -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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - -import lombok.Data; - -/** - * 库存出入库明细 - */ -@ApiModel(value = "com-glxp-api-entity-thrsys-ThrInvOrder") -@Data -@TableName(value = "thr_inv_order") -public class ThrInvOrderEntity implements Serializable { - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value = "") - private Integer id; - - /** - * 单据号 - */ - @TableField(value = "billNo") - @ApiModelProperty(value = "单据号") - private String billNo; - - /** - * 单据时间 - */ - @TableField(value = "billDate") - @ApiModelProperty(value = "单据时间") - private Date billDate; - - /** - * 库存开始时间 - */ - @TableField(value = "startDate") - @ApiModelProperty(value = "库存开始时间") - private Date startDate; - - /** - * 库存结束时间 - */ - @TableField(value = "endDate") - @ApiModelProperty(value = "库存结束时间") - private Date endDate; - - /** - * 出入库类型 - */ - @TableField(value = "mainAction") - @ApiModelProperty(value = "出入库类型") - private String mainAction; - - /** - * 第三方单据类型 - */ - @TableField(value = "billType") - @ApiModelProperty(value = "第三方单据类型") - private String billType; - - /** - * 部门编码 - */ - @TableField(value = "deptCode") - @ApiModelProperty(value = "部门编码") - private String deptCode; - - /** - * 仓库编码 - */ - @TableField(value = "invCode") - @ApiModelProperty(value = "仓库编码") - private String invCode; - - /** - * 货位编码 - */ - @TableField(value = "spaceCode") - @ApiModelProperty(value = "货位编码") - private String spaceCode; - - /** - * 单据状态 - */ - @TableField(value = "`status`") - @ApiModelProperty(value = "单据状态") - private Byte status; - - /** - * 创建时间 - */ - @TableField(value = "createTime") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 创建人 - */ - @TableField(value = "`createUser`") - @ApiModelProperty(value = "创建人") - private String createUser; - - /** - * 更新时间 - */ - @TableField(value = "updateTime") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** - * 更新人 - */ - @TableField(value = "updateUser") - @ApiModelProperty(value = "更新人") - private String updateUser; - - /** - * 备注 - */ - @TableField(value = "remark") - @ApiModelProperty(value = "备注") - private String remark; - - private static final long serialVersionUID = 1L; -} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java index 7c59a6ec0..8051ceaf4 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemBusApiEntity.java @@ -39,6 +39,10 @@ public class ThrSystemBusApiEntity { @TableField(value = "remark") private String remark; + + @TableField(value = "fromCorp") + private String fromCorp; + /** * 扩展字段，暂未启用 */ diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrInvOrderResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrInvOrderResponse.java new file mode 100644 index 000000000..506bbfe67 --- /dev/null +++ b/src/main/java/com/glxp/api/res/thrsys/ThrInvOrderResponse.java @@ -0,0 +1,114 @@ +package com.glxp.api.res.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrInvOrderResponse { + + private String billTypeName; + + private String invName; + + private Long id; + /** + * 单据号 + */ + private String billNo; + + /** + * 单据时间 + */ + private Date billDate; + + /** + * 库存开始时间 + */ + private Date startDate; + + /** + * 库存结束时间 + */ + private Date endDate; + + /** + * 出入库类型 + */ + private String mainAction; + + /** + * 第三方单据类型 + */ + private String billType; + + /** + * 外部系统 + */ + private String thirdSysFk; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 货位编码 + */ + private String spaceCode; + + /** + * 单据状态 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createUser; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 备注 + */ + private String remark; + + /** + * 来源类型，1收费，2普耗，3高耗 + */ + private Integer sourceType; + + /** + * 异常信息 + */ + private String exMsg; + + /** + * 是否组套 + */ + private Integer skProject; + /** + * 往来单位 + */ + private String fromCorp; + +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java index 97ac5aca0..385ebd2ba 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java @@ -53,6 +53,7 @@ public class BasicDestinyRelService extends ServiceImpl> baseResponse = erpInvClient.getInvSfResult(filterInvProductRequest); if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); if (CollectionUtil.isNotEmpty(list)) { - String billNo = generateBillNo(filterInvProductRequest);//单据号 - //处理 返回实体 转换成 单据 和 单据明细 - ThrInvOrder thrInvOrder = new ThrInvOrder(); - List thrInvOrderDetails = new ArrayList<>(); - String thirdSys = filterInvProductRequest.getThirdSys(); - handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder); - if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) { + Map> groupedByInv = list.stream() + .collect(Collectors.groupingBy(ThrInvResultResponse::getInvCode)); + + groupedByInv.forEach((invCode, invResultResponses) -> { + String billNo = generateBillNo(filterInvProductRequest);//单据号 + //处理 返回实体 转换成 单据 和 单据明细 + ThrInvOrder thrInvOrder = new ThrInvOrder(); + List thrInvOrderDetails = new ArrayList<>(); + String thirdSys = filterInvProductRequest.getThirdSys(); + handleExternalConvertThrInvOrderDetail(invResultResponses, thrInvOrderDetails, billNo, thirdSys, thrInvOrder, 1); + + if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) { + handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, invResultResponses.get(0), Constant.THR_INV_SF_ORDER_TYPE); + //保存数据 + thrInvOrderMapper.insert(thrInvOrder); + thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails); + } + + + }); - handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0), Constant.THR_INV_SF_ORDER_TYPE); - //保存数据 - thrInvOrderMapper.insert(thrInvOrder); - thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails); - } } + return ResultVOUtils.success("下载成功！"); + } else { + return baseResponse; } + } @Override @@ -140,7 +151,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ThrInvOrder thrInvOrder = new ThrInvOrder(); List thrInvOrderDetails = new ArrayList<>(); String thirdSys = filterInvProductRequest.getThirdSys(); - handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder); + handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder, 0); if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) { handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0), Constant.THR_INV_PH_ORDER_TYPE); @@ -670,14 +681,15 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { } @Override - public void downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + public BaseResponse downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { log.info("手动抓取第三方收费出入库明细生成单据定时任务开始"); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); - handleExternalThrInvSfOrder(filterInvProductRequest); log.info("手动抓取第三方收费出入库明细生成单据定时任务结束"); + return handleExternalThrInvSfOrder(filterInvProductRequest); + } @Override @@ -820,16 +832,22 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { * @param thrInvOrder * @param thrInvResultResponse */ + + @Resource + ThrSystemBusApiService thrSystemBusApiService; + private void handleExternalConvertThrInvOrder(String billNo, FilterInvProductRequest filterInvProductRequest, ThrInvOrder thrInvOrder, ThrInvResultResponse thrInvResultResponse, Integer SourceType) { + Date newDate = new Date(); + ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiService.getOne(new QueryWrapper().eq("code", thrInvResultResponse.getBillType()).last("limit 1")); thrInvOrder.setBillNo(billNo);//单据号 thrInvOrder.setBillDate(newDate);//单据时间 thrInvOrder.setStartDate(filterInvProductRequest.getStartDate());//库存开始时间 thrInvOrder.setEndDate(filterInvProductRequest.getEndDate());//库存结束时间 thrInvOrder.setMainAction(thrInvResultResponse.getMainAction());//出入库类型 - thrInvOrder.setBillType(thrInvResultResponse.getMainAction());//第三方单据类型 + thrInvOrder.setBillType(thrInvResultResponse.getBillType());//第三方单据类型 thrInvOrder.setThirdSysFk(filterInvProductRequest.getThirdSys());//外部系统 thrInvOrder.setDeptCode(thrInvResultResponse.getDeptCode());//部门编号 thrInvOrder.setInvCode(thrInvResultResponse.getInvCode());//仓库代码 @@ -837,6 +855,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { thrInvOrder.setStatus(ConstantStatus.SFIO_DRAFT);//单据状态 草稿 thrInvOrder.setSourceType(SourceType);//来源类型 thrInvOrder.setCreateTime(newDate); + if (thrSystemBusApiEntity != null) + thrInvOrder.setFromCorp(thrSystemBusApiEntity.getFromCorp()); thrInvOrder.setCreateUser("外部系统下载"); } @@ -850,9 +870,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { */ private void handleExternalConvertThrInvOrderDetail (List list, List thrInvOrderDetails, String billNo, String - thirdSys, ThrInvOrder thrInvOrder) { - Integer inv_set_enable = Integer.valueOf(systemParamConfigService.selectValueByParamKey("inv_set_enable")); - if (inv_set_enable == null || inv_set_enable == 0) {//直接明细 不走项目组套 + thirdSys, ThrInvOrder thrInvOrder, Integer sourceType) { +// Integer inv_set_enable = Integer.valueOf(systemParamConfigService.selectValueByParamKey("inv_set_enable")); + if (sourceType == 0) {//直接明细 不走项目组套 thrInvOrder.setSkProject(0); List thrCodes = list.stream().map(ThrInvResultResponse::getThrCode).collect(Collectors.toList()); MainIdRelIdAndProductResponse map = udiRelevanceService.selectMainIdRelIdAndProductMap(thrCodes, thirdSys); @@ -865,9 +885,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { Long relId = mainIdRelIdMap.get(thrCode); Integer count; if (ConstantType.TYPE_PUT.equals(mainAction)) { - count = Integer.valueOf(item.getInCount()); + count = IntUtil.value(item.getInCount()); } else { - count = Integer.valueOf(item.getOutCount()); + count = IntUtil.value(item.getOutCount()); } ThrInvOrderDetail thrInvOrderDetail = new ThrInvOrderDetail(); BeanUtils.copyProperties(item, thrInvOrderDetail); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eff144325..b2df4abe2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 19d8bf0c5..4badcdc1f 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -148,7 +148,7 @@ - - select - - from thr_inv_order - where id = #{id,jdbcType=INTEGER} - - - - delete from thr_inv_order - where id = #{id,jdbcType=INTEGER} - - - - insert into thr_inv_order (billNo, billDate, startDate, - endDate, mainAction, billType,thirdSysFk, - deptCode, invCode, spaceCode, - `status`, createTime, `createUser`, - updateTime, updateUser, remark,sourceType,exMsg,skProject - ) - values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{startDate,jdbcType=TIMESTAMP}, - #{endDate,jdbcType=TIMESTAMP}, #{mainAction,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},#{thirdSysFk,jdbcType=VARCHAR}, - #{deptCode,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR}, - #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{sourceType,jdbcType=INTEGER} - , #{exMsg,jdbcType=VARCHAR}, #{skProject,jdbcType=INTEGER} - ) - - - - insert into thr_inv_order - - - billNo, - - - billDate, - - - startDate, - - - endDate, - - - mainAction, - - - billType, - - - thirdSysFk, - - - deptCode, - - - invCode, - - - spaceCode, - - - `status`, - - - createTime, - - - `createUser`, - - - updateTime, - - - updateUser, - - - remark, - - - sourceType, - - - exMsg, - - - skProject, - - - - - #{billNo,jdbcType=VARCHAR}, - - - #{billDate,jdbcType=TIMESTAMP}, - - - #{startDate,jdbcType=TIMESTAMP}, - - - #{endDate,jdbcType=TIMESTAMP}, - - - #{mainAction,jdbcType=VARCHAR}, - - - #{billType,jdbcType=VARCHAR}, - - - #{thirdSysFk,jdbcType=VARCHAR}, - - - #{deptCode,jdbcType=VARCHAR}, - - - #{invCode,jdbcType=VARCHAR}, - - - #{spaceCode,jdbcType=VARCHAR}, - - - #{status,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{updateUser,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{sourceType,jdbcType=INTEGER}, - - - #{exMsg,jdbcType=VARCHAR}, - - - #{skProject,jdbcType=INTEGER}, - - - - - - update thr_inv_order - - - billNo = #{billNo,jdbcType=VARCHAR}, - - - billDate = #{billDate,jdbcType=TIMESTAMP}, - - - startDate = #{startDate,jdbcType=TIMESTAMP}, - - - endDate = #{endDate,jdbcType=TIMESTAMP}, - - - mainAction = #{mainAction,jdbcType=VARCHAR}, - - - billType = #{billType,jdbcType=VARCHAR}, - - - thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, - - - deptCode = #{deptCode,jdbcType=VARCHAR}, - - - invCode = #{invCode,jdbcType=VARCHAR}, - - - spaceCode = #{spaceCode,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=TINYINT}, - - - createTime = #{createTime,jdbcType=TIMESTAMP}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - - - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - sourceType = #{sourceType,jdbcType=INTEGER}, - - - exMsg = #{exMsg,jdbcType=VARCHAR}, - - - skProject = #{skProject,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - - update thr_inv_order - set billNo = #{billNo,jdbcType=VARCHAR}, - billDate = #{billDate,jdbcType=TIMESTAMP}, - startDate = #{startDate,jdbcType=TIMESTAMP}, - endDate = #{endDate,jdbcType=TIMESTAMP}, - mainAction = #{mainAction,jdbcType=VARCHAR}, - billType = #{billType,jdbcType=VARCHAR}, - thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, - deptCode = #{deptCode,jdbcType=VARCHAR}, - invCode = #{invCode,jdbcType=VARCHAR}, - spaceCode = #{spaceCode,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=TINYINT}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - sourceType = #{sourceType,jdbcType=INTEGER}, - exMsg = #{exMsg,jdbcType=VARCHAR}, - skProject = #{skProject,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - + + + + + + + + + + + + + + + + + + + + + + + + + + + id, billNo, billDate, startDate, endDate, mainAction, billType,thirdSysFk, deptCode, invCode, + spaceCode, `status`, createTime, `createUser`, updateTime, updateUser, remark,sourceType,exMsg,skProject + + + + + delete + from thr_inv_order + where id = #{id,jdbcType=INTEGER} + + + + insert into thr_inv_order + + + billNo, + + + billDate, + + + startDate, + + + endDate, + + + mainAction, + + + billType, + + + thirdSysFk, + + + deptCode, + + + invCode, + + + spaceCode, + + + `status`, + + + createTime, + + + `createUser`, + + + updateTime, + + + updateUser, + + + remark, + + + sourceType, + + + exMsg, + + + skProject, + + + + + #{billNo,jdbcType=VARCHAR}, + + + #{billDate,jdbcType=TIMESTAMP}, + + + #{startDate,jdbcType=TIMESTAMP}, + + + #{endDate,jdbcType=TIMESTAMP}, + + + #{mainAction,jdbcType=VARCHAR}, + + + #{billType,jdbcType=VARCHAR}, + + + #{thirdSysFk,jdbcType=VARCHAR}, + + + #{deptCode,jdbcType=VARCHAR}, + + + #{invCode,jdbcType=VARCHAR}, + + + #{spaceCode,jdbcType=VARCHAR}, + + + #{status,jdbcType=TINYINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{createUser,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{updateUser,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{sourceType,jdbcType=INTEGER}, + + + #{exMsg,jdbcType=VARCHAR}, + + + #{skProject,jdbcType=INTEGER}, + + + + + + update thr_inv_order + + + billNo = #{billNo,jdbcType=VARCHAR}, + + + billDate = #{billDate,jdbcType=TIMESTAMP}, + + + startDate = #{startDate,jdbcType=TIMESTAMP}, + + + endDate = #{endDate,jdbcType=TIMESTAMP}, + + + mainAction = #{mainAction,jdbcType=VARCHAR}, + + + billType = #{billType,jdbcType=VARCHAR}, + + + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + + + deptCode = #{deptCode,jdbcType=VARCHAR}, + + + invCode = #{invCode,jdbcType=VARCHAR}, + + + spaceCode = #{spaceCode,jdbcType=VARCHAR}, + + + `status` = #{status,jdbcType=TINYINT}, + + + createTime = #{createTime,jdbcType=TIMESTAMP}, + + + `createUser` = #{createUser,jdbcType=VARCHAR}, + + + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + + + updateUser = #{updateUser,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + sourceType = #{sourceType,jdbcType=INTEGER}, + + + exMsg = #{exMsg,jdbcType=VARCHAR}, + + + skProject = #{skProject,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + + update thr_inv_order + set billNo = #{billNo,jdbcType=VARCHAR}, + billDate = #{billDate,jdbcType=TIMESTAMP}, + startDate = #{startDate,jdbcType=TIMESTAMP}, + endDate = #{endDate,jdbcType=TIMESTAMP}, + mainAction = #{mainAction,jdbcType=VARCHAR}, + billType = #{billType,jdbcType=VARCHAR}, + thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, + deptCode = #{deptCode,jdbcType=VARCHAR}, + invCode = #{invCode,jdbcType=VARCHAR}, + spaceCode = #{spaceCode,jdbcType=VARCHAR}, + `status` = #{status,jdbcType=TINYINT}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + `createUser` = #{createUser,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + updateUser = #{updateUser,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + sourceType = #{sourceType,jdbcType=INTEGER}, + exMsg = #{exMsg,jdbcType=VARCHAR}, + skProject = #{skProject,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} + - + + + AND sourceType = #{sourceType} + + + ORDER BY tio.billdate DESC + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml index 28e73ae04..bc63914ea 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml @@ -26,6 +26,9 @@ remark=#{remark}, + + fromCorp=#{fromCorp}, + WHERE id = #{id} @@ -34,7 +37,7 @@ resultType="com.glxp.api.entity.thrsys.ThrSystemBusApiEntity"> SELECT thr_system_bus_api.*, tbo.name thirdBuyName FROM thr_system_bus_api - left join thr_bustype_origin tbo on thr_system_bus_api.thirdBuyCode = tbo.action + left join thr_bustype_origin tbo on thr_system_bus_api.thirdBuyCode = tbo.action AND code = #{code} @@ -55,27 +58,27 @@ insert - ignore + ignore INTO thr_system_bus_api - (`code`, `name`, thirdBuyCode, `thirdSys`, url, `type`, remark) + (`code`, `name`, thirdBuyCode, `thirdSys`, url, `type`, remark, fromCorp) values (#{code}, #{name}, #{thirdBuyCode}, #{thirdSys}, #{url}, #{type}, - #{remark}) + #{remark}, #{fromCorp}) - insert into thr_system_bus_api (code, `name`, thirdBuyCode, thirdSys, type) - values + insert into thr_system_bus_api (code, `name`, thirdBuyCode, thirdSys, type, fromCorp) + values (#{item.code}, #{item.name}, #{item.thirdBuyCode}, #{item.thirdSys}, - #{item.type}) + #{item.type}，#{item.fromCorp}) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 5dc2395c9..32cc15831 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -648,6 +648,9 @@ CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'supId', CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'supId', ' varchar(30) NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1); +CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'thrName', + ' varchar(30) NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1); + INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) @@ -713,3 +716,5 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo', CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1); +CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1); +CALL Pro_Temp_ColumnWork('thr_inv_order', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);