From f4d932671dc901626c758cee89be29a9b9a539b7 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 11 Sep 2024 11:28:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E8=A1=A8=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 14 +- .../collect/IoCollectOriginController.java | 69 +++- .../IoCollectOrderBizOriginMapper.java | 15 + .../collect/IoCollectOrderOriginMapper.java | 15 + .../collect/IoCollectOrderBizOrigin.java | 351 ++++++++++++++++++ .../entity/collect/IoCollectOrderOrigin.java | 326 ++++++++++++++++ .../IoCollectOrderBizOriginService.java | 32 ++ .../collect/IoCollectOrderOriginService.java | 35 ++ .../collect/IoCollectOrderService.java | 16 +- .../collect/IoCollectOrderBizOriginMapper.xml | 42 +++ .../mapper/collect/IoCollectOrderMapper.xml | 4 + .../collect/IoCollectOrderOriginMapper.xml | 112 ++++++ 12 files changed, 1023 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizOriginMapper.java create mode 100644 src/main/java/com/glxp/api/dao/collect/IoCollectOrderOriginMapper.java create mode 100644 src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java create mode 100644 src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java create mode 100644 src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java create mode 100644 src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java create mode 100644 src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml create mode 100644 src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 0e956cf7a..2f5e51b27 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -5,6 +5,7 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -12,10 +13,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; -import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.collect.IoCollectOrderBiz; -import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; -import com.glxp.api.entity.collect.IoCollectOrderCodeMan; +import com.glxp.api.entity.collect.*; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.req.basic.PrescribeBindWorkRequest; import com.glxp.api.req.collect.CollectOrderBindWorkRequest; @@ -52,6 +50,9 @@ public class IoCollectOrderController extends BaseController { @Resource IoCollectOrderService collectOrderService; + @Resource + IoCollectOrderOriginService collectOrderOriginService; + @Resource IoCollectOrderBizService collectOrderBizService; @@ -250,6 +251,11 @@ public class IoCollectOrderController extends BaseController { collectOrder.setUpdateTime(new Date()); collectOrder.setUpdateUser(getUserId()); collectOrderService.updateById(collectOrder); + + if (collectOrder.getTagStatus() == 2){ + collectOrderOriginService.update( new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo,collectOrder.getBillNo()) + .set(IoCollectOrderOrigin::getTagStatus,2)); + } return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 98ca7fa19..613e4b1ed 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -1,26 +1,47 @@ package com.glxp.api.controller.collect; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.entity.collect.IoCollectOrderOrigin; +import com.glxp.api.req.basic.BasicCollectUserRequest; +import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UserWorkResponse; +import com.glxp.api.res.collect.CollectOrderBizResponse; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.service.basic.BasicCollectUserService; +import com.glxp.api.service.collect.IoCollectOrderBizOriginService; +import com.glxp.api.service.collect.IoCollectOrderOriginService; import com.glxp.api.service.collect.IoCollectOriginService; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; /** * 原始单据下载 */ @RestController -public class IoCollectOriginController { - +public class IoCollectOriginController extends BaseController { + @Resource + private BasicCollectUserService basicCollectUserService; + @Resource + private IoCollectOrderOriginService collectOrderOriginService; @Resource IoCollectOriginService collectOriginService; + @Resource + IoCollectOrderBizOriginService collectOrderBizOriginService; @PostMapping("/udiwms/basic/collect/origin/order/download") public BaseResponse downloadOrder(@RequestBody CollectOrderRequest collectOrderRequest) { @@ -40,4 +61,48 @@ public class IoCollectOriginController { return ResultVOUtils.success(); } + @GetMapping("/udiwms/basic/collect/origin/order/filter") + public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { + + List workPlaceCodes = null; + List page; + if (collectOrderRequest.getWorkPlaceCode() == null) { + Long userId = getUserId(); + BasicCollectUserRequest request = new BasicCollectUserRequest(); + request.setPage(1); + request.setLimit(100); + request.setUserId(userId.toString()); + page = basicCollectUserService.filterList(request); + if (page != null) { + workPlaceCodes = page.stream() + .map(UserWorkResponse::getWorkplaceId) + .collect(Collectors.toList()); + } + collectOrderRequest.setWorkPlaceCodes(workPlaceCodes); + } + List orderResponses = collectOrderOriginService.filterList(collectOrderRequest); + PageInfo pageInfo = new PageInfo<>(orderResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/basic/collect/origin/order/detail") + public BaseResponse detail(CollectOrderBizRequest collectOrderBizRequest) { + if (StrUtil.isBlank(collectOrderBizRequest.getOrderIdFk())) { + return ResultVOUtils.error(500, "单据号不能为空"); + } + IoCollectOrderOrigin collectOrder = collectOrderOriginService.getByBillNo(collectOrderBizRequest.getOrderIdFk()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + List list = collectOrderBizOriginService.filterList(collectOrderBizRequest); + 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/IoCollectOrderBizOriginMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizOriginMapper.java new file mode 100644 index 000000000..e09b15af7 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizOriginMapper.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoCollectOrderBizOrigin; +import com.glxp.api.req.collect.CollectOrderBizRequest; +import com.glxp.api.res.collect.CollectOrderBizResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoCollectOrderBizOriginMapper extends BaseMapper { + + List filterList(CollectOrderBizRequest collectOrderRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderOriginMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderOriginMapper.java new file mode 100644 index 000000000..488390c75 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderOriginMapper.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoCollectOrderOrigin; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoCollectOrderOriginMapper extends BaseMapper { + + List filterList(CollectOrderRequest collectOrderRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java new file mode 100644 index 000000000..113833c43 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java @@ -0,0 +1,351 @@ +package com.glxp.api.entity.collect; + +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-collect-IoCollectOrderBizOrigin") +@Data +@TableName(value = "io_collect_order_biz_origin") +public class IoCollectOrderBizOrigin implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="") + private Long id; + + /** + * 单据号 + */ + @TableField(value = "orderIdFk") + @ApiModelProperty(value="单据号") + private String orderIdFk; + + /** + * 物资字典ID + */ + @TableField(value = "relId") + @ApiModelProperty(value="物资字典ID") + private Long relId; + + /** + * 院内编码（第三方编码） + */ + @TableField(value = "thrCode") + @ApiModelProperty(value="院内编码（第三方编码）") + private String thrCode; + + /** + * 医保编码 + */ + @TableField(value = "ybbm") + @ApiModelProperty(value="医保编码") + private String ybbm; + + /** + * 收费编码 + */ + @TableField(value = "payFeeCode") + @ApiModelProperty(value="收费编码") + private String payFeeCode; + + /** + * 商品条码 + */ + @TableField(value = "sptm") + @ApiModelProperty(value="商品条码") + private String sptm; + + /** + * 产品通用名称 + */ + @TableField(value = "cpmctymc") + @ApiModelProperty(value="产品通用名称") + private String cpmctymc; + + /** + * 产品标识 + */ + @TableField(value = "nameCode") + @ApiModelProperty(value="产品标识") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + @ApiModelProperty(value="批次号") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productDate") + @ApiModelProperty(value="生产日期") + private String productDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + @ApiModelProperty(value="失效日期") + private String expireDate; + + /** + * 单据数量 + */ + @TableField(value = "count") + @ApiModelProperty(value="单据数量") + private Integer count; + + /** + * 未拆零数量 + */ + @TableField(value = "unTagCount") + @ApiModelProperty(value="未拆零数量") + private Integer unTagCount; + + /** + * 实际数量 + */ + @TableField(value = "actCount") + @ApiModelProperty(value="实际数量") + private Integer actCount; + + /** + * 扫码数量 + */ + @TableField(value = "scanCount") + @ApiModelProperty(value="扫码数量") + private Integer scanCount; + + /** + * 扫码实际数量 + */ + @TableField(value = "scanActCount") + @ApiModelProperty(value="扫码实际数量") + private Integer scanActCount; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + @ApiModelProperty(value="规格型号") + private String ggxh; + + /** + * 计量单位 + */ + @TableField(value = "measureUnit") + @ApiModelProperty(value="计量单位") + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + @TableField(value = "tagStatus") + @ApiModelProperty(value="单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码") + private Byte tagStatus; + + /** + * 赋码错误信息 + */ + @TableField(value = "tagMsg") + @ApiModelProperty(value="赋码错误信息") + private String tagMsg; + + /** + * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足 + */ + @TableField(value = "autoTagStatus") + @ApiModelProperty(value="自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足") + private Byte autoTagStatus; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + @TableField(value = "remark1") + @ApiModelProperty(value="") + private String remark1; + + @TableField(value = "remark2") + @ApiModelProperty(value="") + private String remark2; + + @TableField(value = "remark3") + @ApiModelProperty(value="") + private String remark3; + + @TableField(value = "remark4") + @ApiModelProperty(value="") + private String remark4; + + @TableField(value = "remark5") + @ApiModelProperty(value="") + private String remark5; + + @TableField(value = "remark6") + @ApiModelProperty(value="") + private String remark6; + + @TableField(value = "remark7") + @ApiModelProperty(value="") + private String remark7; + + @TableField(value = "remark8") + @ApiModelProperty(value="") + private String remark8; + + @TableField(value = "remark9") + @ApiModelProperty(value="") + private String remark9; + + @TableField(value = "remark10") + @ApiModelProperty(value="") + private String remark10; + + @TableField(value = "remark11") + @ApiModelProperty(value="") + private String remark11; + + @TableField(value = "remark12") + @ApiModelProperty(value="") + private String remark12; + + @TableField(value = "remark13") + @ApiModelProperty(value="") + private String remark13; + + @TableField(value = "remark14") + @ApiModelProperty(value="") + private String remark14; + + @TableField(value = "remark15") + @ApiModelProperty(value="") + private String remark15; + + /** + * 自动扫码预分配工位存量 + */ + @TableField(value = "autoResCount") + @ApiModelProperty(value="自动扫码预分配工位存量") + private Integer autoResCount; + + /** + * 替换码 + */ + @TableField(value = "replaceCode") + @ApiModelProperty(value="替换码") + private String replaceCode; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_RELID = "relId"; + + public static final String COL_THRCODE = "thrCode"; + + public static final String COL_YBBM = "ybbm"; + + public static final String COL_PAYFEECODE = "payFeeCode"; + + public static final String COL_SPTM = "sptm"; + + public static final String COL_CPMCTYMC = "cpmctymc"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCTDATE = "productDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_COUNT = "count"; + + public static final String COL_UNTAGCOUNT = "unTagCount"; + + public static final String COL_ACTCOUNT = "actCount"; + + public static final String COL_SCANCOUNT = "scanCount"; + + public static final String COL_SCANACTCOUNT = "scanActCount"; + + public static final String COL_GGXH = "ggxh"; + + public static final String COL_MEASUREUNIT = "measureUnit"; + + public static final String COL_TAGSTATUS = "tagStatus"; + + public static final String COL_TAGMSG = "tagMsg"; + + public static final String COL_AUTOTAGSTATUS = "autoTagStatus"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK1 = "remark1"; + + public static final String COL_REMARK2 = "remark2"; + + public static final String COL_REMARK3 = "remark3"; + + public static final String COL_REMARK4 = "remark4"; + + public static final String COL_REMARK5 = "remark5"; + + public static final String COL_REMARK6 = "remark6"; + + public static final String COL_REMARK7 = "remark7"; + + public static final String COL_REMARK8 = "remark8"; + + public static final String COL_REMARK9 = "remark9"; + + public static final String COL_REMARK10 = "remark10"; + + public static final String COL_REMARK11 = "remark11"; + + public static final String COL_REMARK12 = "remark12"; + + public static final String COL_REMARK13 = "remark13"; + + public static final String COL_REMARK14 = "remark14"; + + public static final String COL_REMARK15 = "remark15"; + + public static final String COL_AUTORESCOUNT = "autoResCount"; + + public static final String COL_REPLACECODE = "replaceCode"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java new file mode 100644 index 000000000..21f2b1ba6 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java @@ -0,0 +1,326 @@ +package com.glxp.api.entity.collect; + +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-purchase-IoCollectOrderOrigin") +@Data +@TableName(value = "io_collect_order_origin") +public class IoCollectOrderOrigin implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="") + private Integer id; + + /** + * 自定义本单据号 + */ + @TableField(value = "orderId") + @ApiModelProperty(value="自定义本单据号") + private String orderId; + + /** + * 单据号(原始单据号） + */ + @TableField(value = "billNo") + @ApiModelProperty(value="单据号(原始单据号）") + private String billNo; + + /** + * 单据类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value="单据类型") + private String busType; + + /** + * 出入库类型：1：入库；2：出库 + */ + @TableField(value = "inoutType") + @ApiModelProperty(value="出入库类型：1：入库；2：出库") + private Integer inoutType; + + /** + * 来源业务 + */ + @TableField(value = "fromType") + @ApiModelProperty(value="来源业务") + private String fromType; + + /** + * 来源业务说明 + */ + @TableField(value = "fromTypeDesc") + @ApiModelProperty(value="来源业务说明") + private String fromTypeDesc; + + /** + * 本系统往来单位编码 + */ + @TableField(value = "localFromCorp") + @ApiModelProperty(value="本系统往来单位编码") + private String localFromCorp; + + /** + * 往来信息 + */ + @TableField(value = "fromCorp") + @ApiModelProperty(value="往来信息") + private String fromCorp; + + /** + * 往来信息名称 + */ + @TableField(value = "fromCorpName") + @ApiModelProperty(value="往来信息名称") + private String fromCorpName; + + /** + * 单据时间 + */ + @TableField(value = "billTime") + @ApiModelProperty(value="单据时间") + private Date billTime; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 采集时间/单据处理时间 + */ + @TableField(value = "collectTime") + @ApiModelProperty(value="采集时间/单据处理时间") + private Date collectTime; + + /** + * 工位编码 + */ + @TableField(value = "workPlaceCode") + @ApiModelProperty(value="工位编码") + private Long workPlaceCode; + + /** + * （停用）拆零状态：0：未拆零，1，正在拆零；2,已完成；3.拆零失败 + */ + @TableField(value = "splitStatus") + @ApiModelProperty(value="（停用）拆零状态：0：未拆零，1，正在拆零；2,已完成；3.拆零失败") + private Integer splitStatus; + + /** + * 拆零异常信息 + */ + @TableField(value = "splitMsg") + @ApiModelProperty(value="拆零异常信息") + private String splitMsg; + + /** + * 赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常 + */ + @TableField(value = "tagStatus") + @ApiModelProperty(value="赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常") + private Integer tagStatus; + + /** + * 赋码信息 + */ + @TableField(value = "tagMsg") + @ApiModelProperty(value="赋码信息") + private String tagMsg; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + /** + * 创建人 + */ + @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 = "finishTime") + @ApiModelProperty(value="完成时间") + private Date finishTime; + + /** + * 单据挂起时间 + */ + @TableField(value = "draftTime") + @ApiModelProperty(value="单据挂起时间") + private Date draftTime; + + /** + * 1：流通；2:使用 + */ + @TableField(value = "orderCirType") + @ApiModelProperty(value="1：流通；2:使用") + private Integer orderCirType; + + /** + * 备用查询字段1 + */ + @TableField(value = "backupOrderRemark1") + @ApiModelProperty(value="备用查询字段1") + private String backupOrderRemark1; + + /** + * 备用查询字段2 + */ + @TableField(value = "backupOrderRemark2") + @ApiModelProperty(value="备用查询字段2") + private String backupOrderRemark2; + + /** + * 备用查询字段3 + */ + @TableField(value = "backupOrderRemark3") + @ApiModelProperty(value="备用查询字段3") + private String backupOrderRemark3; + + /** + * 备用查询字段4 + */ + @TableField(value = "backupOrderRemark4") + @ApiModelProperty(value="备用查询字段4") + private String backupOrderRemark4; + + /** + * 备用查询字段5 + */ + @TableField(value = "backupOrderRemark5") + @ApiModelProperty(value="备用查询字段5") + private String backupOrderRemark5; + + /** + * 备用查询字段6 + */ + @TableField(value = "backupOrderRemark6") + @ApiModelProperty(value="备用查询字段6") + private String backupOrderRemark6; + + /** + * 备用字段1 + */ + @TableField(value = "remark1") + @ApiModelProperty(value="备用字段1") + private String remark1; + + /** + * 备用字段2 + */ + @TableField(value = "remark2") + @ApiModelProperty(value="备用字段2") + private String remark2; + + /** + * 备用字段3 + */ + @TableField(value = "remark3") + @ApiModelProperty(value="备用字段3") + private String remark3; + + /** + * 备用字段4 + */ + @TableField(value = "remark4") + @ApiModelProperty(value="备用字段4") + private String remark4; + + /** + * 备用字段5 + */ + @TableField(value = "remark5") + @ApiModelProperty(value="备用字段5") + private String remark5; + + /** + * 备用字段6 + */ + @TableField(value = "remark6") + @ApiModelProperty(value="备用字段6") + private String remark6; + + /** + * 备用字段7 + */ + @TableField(value = "remark7") + @ApiModelProperty(value="备用字段7") + private String remark7; + + /** + * 备用字段8 + */ + @TableField(value = "remark8") + @ApiModelProperty(value="备用字段8") + private String remark8; + + /** + * 排序时间 + */ + @TableField(value = "orderTime") + @ApiModelProperty(value="排序时间") + private Date orderTime; + + /** + * 库存预警： 1:正常; 2:不足 + */ + @TableField(value = "invAlert") + @ApiModelProperty(value="库存预警： 1:正常; 2:不足") + private Integer invAlert; + + /** + * 上传状态(1.未上传,2.已上传,3.上传失败) + */ + @TableField(value = "uploadStatus") + @ApiModelProperty(value="上传状态(1.未上传,2.已上传,3.上传失败)") + private Integer uploadStatus; + + /** + * 上传错误信息 + */ + @TableField(value = "uploadError") + @ApiModelProperty(value="上传错误信息") + private String uploadError; + + /** + * 异常信息 + */ + @TableField(value = "errorMsg") + @ApiModelProperty(value="异常信息") + private String errorMsg; + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java new file mode 100644 index 000000000..138207c92 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java @@ -0,0 +1,32 @@ +package com.glxp.api.service.collect; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.collect.CollectOrderBizRequest; +import com.glxp.api.res.collect.CollectOrderBizResponse; +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.IoCollectOrderBizOrigin; +import com.glxp.api.dao.collect.IoCollectOrderBizOriginMapper; + + + +@Service +public class IoCollectOrderBizOriginService extends ServiceImpl { + + + public List filterList(CollectOrderBizRequest collectOrderRequest) { + if (collectOrderRequest == null) { + return Collections.emptyList(); + } + if (collectOrderRequest.getPage() != null) { + int offset = (collectOrderRequest.getPage() - 1) * collectOrderRequest.getLimit(); + PageHelper.offsetPage(offset, collectOrderRequest.getLimit()); + } + List data = this.baseMapper.filterList(collectOrderRequest); + return data; + } + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java new file mode 100644 index 000000000..675e48af4 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java @@ -0,0 +1,35 @@ +package com.glxp.api.service.collect; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.collect.IoCollectOrderOrigin; +import com.glxp.api.dao.collect.IoCollectOrderOriginMapper; + +import java.util.Collections; +import java.util.List; + +@Service +public class IoCollectOrderOriginService extends ServiceImpl { + + + public List filterList(CollectOrderRequest collectOrderRequest) { + if (collectOrderRequest == null) { + return Collections.emptyList(); + } + if (collectOrderRequest.getPage() != null) { + int offset = (collectOrderRequest.getPage() - 1) * collectOrderRequest.getLimit(); + PageHelper.offsetPage(offset, collectOrderRequest.getLimit()); + } + List data = this.baseMapper.filterList(collectOrderRequest); + return data; + } + + public IoCollectOrderOrigin getByBillNo(String billNo) { + return this.baseMapper.selectOne(new LambdaQueryWrapper().eq(IoCollectOrderOrigin::getBillNo, billNo).last("limit 1")); + } +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index de20aeebd..3d4f7120b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -123,6 +123,10 @@ public class IoCollectOrderService extends ServiceImpl().eq(IoCollectOrder::getBillNo, billNo).last("limit 1")); @@ -463,6 +467,8 @@ public class IoCollectOrderService extends ServiceImpl().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()))) { continue; } @@ -502,10 +508,14 @@ public class IoCollectOrderService extends ServiceImpl bizList = collectOrder.getBizList(); if (CollUtil.isNotEmpty(bizList)) { for (IoCollectOrderBiz collectOrderBiz : bizList) { @@ -522,6 +532,8 @@ public class IoCollectOrderService extends ServiceImpl ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class); + collectOrderBizOriginService.saveBatch(ioCollectOrderBizOrigins); } if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1 && IntUtil.value(collectOrder.getTagStatus()) == 1) { splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1); diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml new file mode 100644 index 000000000..61e013f59 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index f7dd924f4..42295d1ce 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -123,6 +123,10 @@ TRUNCATE io_split_des_order; TRUNCATE io_split_des_order_code; TRUNCATE io_split_des_order_detail; + TRUNCATE io_collect_order_code_man; + + TRUNCATE io_collect_order_origin; + TRUNCATE io_collect_order_biz_origin; diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml new file mode 100644 index 000000000..762bedd05 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + \ No newline at end of file