From 00210b6a6bef3c2b0ac3209a653758ed6057ad55 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 29 Aug 2024 18:49:28 +0800 Subject: [PATCH] =?UTF-8?q?8/29=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoFifoDesOrderController.java | 25 +++++ .../collect/IoSplitDesOrderCodeMapper.java | 7 +- .../basic/SysWorkplaceDocumentEntity.java | 9 +- .../entity/collect/IoSplitDesOrderCode.java | 4 +- .../IoSplitDesOrderCodeDetailRequest.java | 55 +++++++++++ .../basic/SysWorkplaceDocumentResponse.java | 1 + .../IoSplitDesOrderCodeDetailResponse.java | 92 +++++++++++++++++++ .../collect/IoSplitDesOrderCodeService.java | 18 ++++ .../collect/IoSplitDesOrderCodeMapper.xml | 12 ++- src/main/resources/schemas/schema_v2.4.sql | 4 + 10 files changed, 220 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/collect/IoSplitDesOrderCodeDetailRequest.java create mode 100644 src/main/java/com/glxp/api/res/collect/IoSplitDesOrderCodeDetailResponse.java diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index 605400fbc..0828b50f6 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -9,12 +9,15 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoSplitDesOrder; import com.glxp.api.req.collect.AddInvDesDetaiRequest; +import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import com.glxp.api.service.collect.IoSplitDesOrderCodeService; import com.glxp.api.service.collect.IoSplitDesOrderDetailService; import com.glxp.api.service.collect.IoSplitDesOrderService; import org.springframework.validation.BindingResult; @@ -34,6 +37,10 @@ public class IoFifoDesOrderController extends BaseController { IoSplitDesOrderService splitDesOrderService; @Resource IoSplitDesOrderDetailService splitDesOrderDetailService; + @Resource + IoSplitDesOrderCodeService ioSplitDesOrderCodeService; + + @GetMapping("/udiwms/collect/fifo/desOrder/filter") public BaseResponse filterOrder(IoSplitDesOrderRequest splitDesOrderRequest) { @@ -63,6 +70,24 @@ public class IoFifoDesOrderController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + + @GetMapping("/udiwms/basic/collect/desOrder/code/detail") + public BaseResponse getCodeDetail(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest) { + if (StrUtil.isBlank(ioSplitDesOrderCodeDetailRequest.getOrderIdFk())) { + return ResultVOUtils.error(500, "单据号不能为空"); + } + IoSplitDesOrder collectOrder = splitDesOrderService.getByBillNo(ioSplitDesOrderCodeDetailRequest.getOrderIdFk()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + List list = ioSplitDesOrderCodeService.filterList(ioSplitDesOrderCodeDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + /** * 选入工位库存 * diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java index 8024534d7..69c36b335 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderCodeMapper.java @@ -2,8 +2,13 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.collect.IoSplitDesOrderCode; +import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest; +import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface IoSplitDesOrderCodeMapper extends BaseMapper { -} \ No newline at end of file + List filterList(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest); +} diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index eb9c93a2c..e824c7229 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -117,7 +117,7 @@ public class SysWorkplaceDocumentEntity { private Integer orderCirType; /** - * 出入库方式： 1:入库; 2:出库 + * 管理设备:： 1:是; 2:否 */ @TableField(value = "inoutType") private Integer inoutType; @@ -128,6 +128,13 @@ public class SysWorkplaceDocumentEntity { @TableField(value = "remark") private String remark; + /** + * 作业类型 1拆零;2取整;3:全部 + */ + @TableField(value = "workplaceType") + private Integer workplaceType; + + diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java index d29bf9aaf..927a432c5 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java @@ -24,7 +24,7 @@ import lombok.NoArgsConstructor; public class IoSplitDesOrderCode implements Serializable { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value = "") - private Integer id; + private Long id; /** * 追溯码 @@ -150,4 +150,4 @@ public class IoSplitDesOrderCode implements Serializable { private String remark; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderCodeDetailRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderCodeDetailRequest.java new file mode 100644 index 000000000..307946dd2 --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderCodeDetailRequest.java @@ -0,0 +1,55 @@ +package com.glxp.api.req.collect; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderCodeDetailRequest extends ListPageRequest { + + + private Integer id; + + private Long workPlaceCode; + + private String orderIdFk; + + private Integer invId; + + private Long relId; + + private String batchNo; + + private String produceDate; + + private String expireDate; + + private Long supId; + + private Integer count; + + private Integer reCount; + + private Date createTime; + + private Date updateTime; + + private String remark; + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + private String unionCode; +} diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index 8a2f037e6..b4bc9edf7 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -122,6 +122,7 @@ public class SysWorkplaceDocumentResponse { private String remark; + private Integer workplaceType; private String innerBusName; private String outBusName; diff --git a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderCodeDetailResponse.java b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderCodeDetailResponse.java new file mode 100644 index 000000000..7394f8e0d --- /dev/null +++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderCodeDetailResponse.java @@ -0,0 +1,92 @@ +package com.glxp.api.res.collect; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderCodeDetailResponse { + + + private Integer id; + + private Long workPlaceCode; + + private String orderIdFk; + + private Integer invId; + + private Long relId; + + private String batchNo; + + private String produceDate; + + private String expireDate; + + private Long supId; + + private Integer count; + + private Integer reCount; + + private Date createTime; + + private Date updateTime; + + private String remark; + + + /** + * 院内编码（第三方编码） + */ + private String thrCode; + + /** + * 医保编码 + */ + private String ybbm; + + /** + * 收费编码 + */ + private String payFeeCode; + + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + + /** + * 计量单位 + */ + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + private Integer tagStatus; + + /** + * 赋码错误信息 + */ + private String tagMsg; + private String coName; + private String measname; + private String zczbhhzbapzbh; + private String manufactory; + private String supName; + + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java index 337395a52..cc5265454 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java @@ -1,7 +1,11 @@ package com.glxp.api.service.collect; +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest; +import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.collect.IoSplitDesOrderCode; @@ -9,4 +13,18 @@ import com.glxp.api.dao.collect.IoSplitDesOrderCodeMapper; @Service public class IoSplitDesOrderCodeService extends ServiceImpl { + @Resource + IoSplitDesOrderCodeMapper ioSplitDesOrderCodeMapper; + + public List filterList(IoSplitDesOrderCodeDetailRequest ioSplitDesOrderCodeDetailRequest) { + if (ioSplitDesOrderCodeDetailRequest == null) { + return Collections.emptyList(); + } + if (ioSplitDesOrderCodeDetailRequest.getPage() != null) { + int offset = (ioSplitDesOrderCodeDetailRequest.getPage() - 1) * ioSplitDesOrderCodeDetailRequest.getLimit(); + PageHelper.offsetPage(offset, ioSplitDesOrderCodeDetailRequest.getLimit()); + } + List list = ioSplitDesOrderCodeMapper.filterList(ioSplitDesOrderCodeDetailRequest); + return list; + } } diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderCodeMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderCodeMapper.xml index 2ed6e7369..d51ccb1cc 100644 --- a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderCodeMapper.xml @@ -26,8 +26,14 @@ - id, code, errUdiCode, orderIdFk, bizIdFk, relId, batchNo, produceDate, expireDate, - serialNo, supId, workPlaceCode, createTime, updateTime, `createUser`, updateUser, + id, code, errUdiCode, orderIdFk, bizIdFk, relId, batchNo, produceDate, expireDate, + serialNo, supId, workPlaceCode, createTime, updateTime, `createUser`, updateUser, `count`, reCount, remark - \ No newline at end of file + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index c2db1d959..ae553768b 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4300,3 +4300,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeLevelCount', CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount', 'int NULL DEFAULT b''1'' COMMENT ''使用是当前层级包含计量单元数量''', 2); + +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'workplaceType', + ' tinyint NULL DEFAULT NULL COMMENT ''作业类型 1拆零;2取整;3:全部''', + 1);