diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 65db1c670..c0d2d2f40 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -53,6 +53,14 @@ public class ConstantStatus { public static final Integer ORDER_STATUS_PROCESSING = 9; + /** + * 单据创建类型 1.新增扫码单据，2、新增业务单据，3、正常单据处理 + */ + public static final Integer ORDER_TYPE_SCAN = 1; + public static final Integer ORDER_TYPE_BIZ = 2; + public static final Integer ORDER_TYPE_NORMAL = 3; + + public static final Integer ORDER_STATUS_ADDITIONAL = 5; //补录单据 // public static final Integer ORDER_STATUS_RECEIVEED = 7; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index b32999680..189a27888 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -594,8 +594,8 @@ public class IoCodeTempController extends BaseController { if (invRes != null) { return invRes; } - - if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) { + //是否边扫边校验 + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) { String errMsg = ioCheckInoutService.checkCode(codeEnttity); if (errMsg != null) { return ResultVOUtils.error(500, errMsg); diff --git a/src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java b/src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java new file mode 100644 index 000000000..b05c233db --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java @@ -0,0 +1,161 @@ +package com.glxp.api.controller.inout; +//领用单 + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +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.constant.Constant; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.InvWarehouseEntity; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.inout.PurReceiveDetailEntity; +import com.glxp.api.entity.inout.PurReceiveEntity; +import com.glxp.api.req.inout.AddReceiveDetailRequest; +import com.glxp.api.req.inout.FilterReceiveDetailRequest; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.ReceiveDetailResponse; +import com.glxp.api.res.inout.ReceiveResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.inout.ReceiveService; +import com.glxp.api.service.inout.ReceivedetailService; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; +import org.springframework.validation.BindingResult; +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.Date; +import java.util.List; + +@RestController +public class ThrOrderReceiveController extends BaseController { + + + @Resource + ReceiveService receiveService; + @Resource + ReceivedetailService receivedetailService; + @Resource + CustomerService customerService; + @Resource + GennerOrderUtils gennerOrderUtils; + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/thrsys/order/insertWeb") + public BaseResponse addReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + Long userId = customerService.getUserId(); + InvWarehouseEntity curWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getInvCode()); + InvWarehouseEntity targetWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getTargetInvCode()); + purReceiveEntity.setCreateUser(userId + ""); + purReceiveEntity.setCreateTime(new Date()); + purReceiveEntity.setUpdateTime(new Date()); + String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + purReceiveEntity.setBillNo(orderNo); + purReceiveEntity.setDeptCode(curWarehouseEntity.getParentId()); + purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId()); + receiveService.insertOrder(purReceiveEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/receive/order/update") + public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + Long userId = customerService.getUserId(); + purReceiveEntity.setUpdateUser(userId + ""); + purReceiveEntity.setUpdateTime(new Date()); + String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + purReceiveEntity.setBillNo(orderNo); + receiveService.updateOrder(purReceiveEntity); + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/receive/order/filter") + public BaseResponse filterReceive(FilterReceiveRequest filterReceiveRequest) { + List data = receiveService.filterList(filterReceiveRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(data); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(data); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/receive/order/detail") + public BaseResponse filterReceiveDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) { + List data = receivedetailService.filterList(filterReceiveDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(data); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(data); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Resource + InvWarehouseService invWarehouseService; + + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/receive/detail/add") + public BaseResponse updateReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + AuthAdmin authAdmin = getUser(); + if (addReceiveDetailRequest.getPurReceiveEntity() == null) + return ResultVOUtils.error(500, "未指定订单"); + + if (CollUtil.isEmpty(addReceiveDetailRequest.getDatas())) { + return ResultVOUtils.error(500, "未选择产品信息"); + } + PurReceiveEntity purReceiveEntity = addReceiveDetailRequest.getPurReceiveEntity(); + if (StrUtil.isEmpty(purReceiveEntity.getBillNo())) { + InvWarehouseEntity curWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getInvCode()); + InvWarehouseEntity targetWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getTargetInvCode()); + String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + purReceiveEntity.setBillNo(orderNo); + purReceiveEntity.setCreateUser(authAdmin.getId() + ""); + purReceiveEntity.setCreateTime(new Date()); + purReceiveEntity.setStatus(1); + purReceiveEntity.setDeptCode(curWarehouseEntity.getParentId()); + purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId()); + receiveService.insertOrder(purReceiveEntity); + } + for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) { + PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity(); + purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo()); + purReceiveDetailEntity.setRelIdFk(detaiData.getRelId()); + purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo()); + purReceiveDetailEntity.setSupId(detaiData.getSupId()); + receivedetailService.insert(purReceiveDetailEntity); + } + purReceiveEntity.setUpdateTime(new Date()); + receiveService.updateOrder(purReceiveEntity); + return ResultVOUtils.success("成功"); + } + + +} diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java new file mode 100644 index 000000000..ea88180fe --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java @@ -0,0 +1,18 @@ +package com.glxp.api.dao.inout; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.inout.IoOrderDetailResultEntity; +import com.glxp.api.entity.inout.PurReceiveEntity; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inout.ReceiveResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ReceiveDao extends BaseMapperPlus { + + List filterList(FilterReceiveRequest filterReceiveRequest); +} diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java new file mode 100644 index 000000000..b1e8a0dcc --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.inout; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.inout.PurReceiveDetailEntity; +import com.glxp.api.req.inout.FilterReceiveDetailRequest; +import com.glxp.api.res.inout.ReceiveDetailResponse; +import com.glxp.api.res.inout.ReceiveResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ReceiveDetailDao extends BaseMapperPlus { + + List filterList(FilterReceiveDetailRequest filterReceiveDetailRequest); +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 20db17b5c..6b91d7ee4 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -185,4 +185,11 @@ public class IoOrderEntity { @TableField(value = "preInBillNo") private String preInBillNo; -} \ No newline at end of file + /** + * 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理 + */ + @TableField(value = "orderType") + private Integer orderType; + + +} diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java new file mode 100644 index 000000000..03059d2fc --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java @@ -0,0 +1,71 @@ +package com.glxp.api.entity.inout; + +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; + +/** + * 领用单详情 + */ +@Data +@TableName(value = "pur_receive_detail") +public class PurReceiveDetailEntity { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 订单外键 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 产品ID + */ + @TableField(value = "relIdFk") + private Long relIdFk; + + @TableField(value = "nameCode") + private String nameCode; + + /** + * 数量 + */ + @TableField(value = "`count`") + private Integer count; + + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + @TableField(value = "productDate") + private String productDate; + + @TableField(value = "batchNo") + private String batchNo; + + @TableField(value = "expireDate") + private String expireDate; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_RELIDFK = "relIdFk"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_COUNT = "count"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_PRODUCTDATE = "productDate"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_EXPIREDATE = "expireDate"; +} diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java new file mode 100644 index 000000000..f3a82aebd --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java @@ -0,0 +1,149 @@ +package com.glxp.api.entity.inout; + +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 = "pur_receive") +public class PurReceiveEntity { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据日期 + */ + @TableField(value = "billDate") + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核,4.已拒绝） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 领用类型 + */ + @TableField(value = "billType") + private String billType; + + /** + * 领用说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 当前仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 所属部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 审核说明 + */ + @TableField(value = "auditRemark") + private String auditRemark; + + /** + * 目标仓库 + */ + @TableField(value = "targetInvCode") + private String targetInvCode; + + /** + * 目标部门 + */ + @TableField(value = "targetDeptCode") + private String targetDeptCode; + + + public static final String COL_ID = "id"; + + public static final String COL_BILLNO = "billNo"; + + public static final String COL_BILLDATE = "billDate"; + + public static final String COL_STATUS = "status"; + + public static final String COL_BILLTYPE = "billType"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_DEPTCODE = "deptCode"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_AUDITTIME = "auditTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_AUDITREMARK = "auditRemark"; + + public static final String COL_TARGETINVCODE = "targetInvCode"; + + public static final String COL_TARGETDEPTCODE = "targetDeptCode"; + +} diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index f44d3110d..03ccd0d6a 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -25,4 +25,5 @@ public class AddOrderRequest { private String serialNo; private boolean vailInv; private boolean codeFillCheck; + private Integer orderType; } diff --git a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java new file mode 100644 index 000000000..5f467b355 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java @@ -0,0 +1,22 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.entity.inout.PurReceiveEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class AddReceiveDetailRequest { + + PurReceiveEntity purReceiveEntity; + List datas; + + @Data + public static class DetaiData { + private Long relId; + private String batchNo; + private String supId; + } + + +} diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveDetailRequest.java new file mode 100644 index 000000000..f2fc3372a --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveDetailRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterReceiveDetailRequest extends ListPageRequest { + private String orderIdFk; +} diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java new file mode 100644 index 000000000..e7183ff8b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -0,0 +1,26 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterReceiveRequest extends ListPageRequest { + + private String billNo; + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; + + private String billType; + private String deptCode; + private String invCode; + private Integer status; + + +} diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java new file mode 100644 index 000000000..94ebb1775 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java @@ -0,0 +1,47 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +@Data +public class ReceiveDetailResponse { + + private Integer id; + + /** + * 订单外键 + */ + private String orderIdFk; + + /** + * 产品ID + */ + private Integer relIdFk; + + private String nameCode; + + /** + * 数量 + */ + private Integer count; + + /** + * 供应商ID + */ + private String supId; + + private String productDate; + + private String batchNo; + + private String expireDate; + + + private String cpmctymc; + private String ggxh; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String manufactory; + private String measname; + private String price; + +} diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java new file mode 100644 index 000000000..93d9643c7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java @@ -0,0 +1,101 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ReceiveResponse { + + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据日期 + */ + private Date billDate; + + /** + * 状态（1.草稿，2.未审核，3.已审核,4.已拒绝） + */ + private Integer status; + + /** + * 领用类型 + */ + private String billType; + + /** + * 领用说明 + */ + private String remark; + + /** + * 当前仓库 + */ + private String invCode; + + private String invName; + + /** + * 所属部门 + */ + private String deptCode; + private String deptName; + + /** + * 创建人 + */ + private String createUser; + private String createUserName; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 审核人 + */ + private String auditUser; + private String auditUserName; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 更新人 + */ + private String updateUser; + private String updateUserName; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 审核说明 + */ + private String auditRemark; + + /** + * 目标仓库 + */ + private String targetInvCode; + private String targetInvName; + + /** + * 目标部门 + */ + private String targetDeptCode; + private String targetDeptName; + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index aa4941db7..acf403b37 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -213,7 +213,6 @@ public class IoAddInoutService { genOrderDetailCode(orderEntity, codeTempEntity); } } - codeTempService.deleteByBillNo(orderEntity.getBillNo()); //进行单据校验 ioCheckInoutService.check(orderEntity.getBillNo()); } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 44c0a2bff..8316107da 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -2,8 +2,6 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; diff --git a/src/main/java/com/glxp/api/service/inout/ReceiveService.java b/src/main/java/com/glxp/api/service/inout/ReceiveService.java new file mode 100644 index 000000000..71ced0bd4 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/ReceiveService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.inout; + +import com.glxp.api.dao.inout.ReceiveDao; +import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.PurReceiveEntity; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.res.inout.ReceiveResponse; + +import javax.annotation.Resource; +import java.util.List; + +/** + * + */ +public interface ReceiveService { + + int insertOrder(PurReceiveEntity purReceiveEntity); + + int updateOrder(PurReceiveEntity purReceiveEntity); + + List filterList(FilterReceiveRequest filterReceiveRequest); + +} diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java new file mode 100644 index 000000000..fd2581959 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -0,0 +1,17 @@ +package com.glxp.api.service.inout; + +import com.glxp.api.entity.inout.PurReceiveDetailEntity; +import com.glxp.api.req.inout.FilterReceiveDetailRequest; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.res.inout.ReceiveDetailResponse; +import com.glxp.api.res.inout.ReceiveResponse; + +import java.util.List; + +public interface ReceivedetailService { + + List filterList(FilterReceiveDetailRequest filterReceiveDetailRequest); + + int insert(PurReceiveDetailEntity receiveDetailEntity); + +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 525a152ea..c5a6cbfa6 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailBizDao; @@ -50,18 +51,19 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public boolean isExit(String billNo) { - return ioOrderDetailBizDao.exists(new QueryWrapper().eq("orderIdFk",billNo)); + return ioOrderDetailBizDao.exists(new QueryWrapper().eq("orderIdFk", billNo)); } @Override - public boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId) { + public boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId) { return ioOrderDetailBizDao.exists(new QueryWrapper().eq("bindRlFk", relId).eq("batchNo", bacthNo).eq("orderIdFk", orderId).ne("id", ignoreId)); } @Override public IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo) { - return ioOrderDetailBizDao.selectOne(new QueryWrapper().eq("orderIdFk", orderId).eq("bindRlFk", relId).eq("batchNo", bacthNo)); + return ioOrderDetailBizDao.selectOne(new QueryWrapper().eq("orderIdFk", orderId).eq("bindRlFk", relId).eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo) + .isNull(StrUtil.isEmpty(bacthNo), "batchNo")); } @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java new file mode 100644 index 000000000..28a9ac85b --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -0,0 +1,36 @@ +package com.glxp.api.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.inout.PurReceiveDetailEntity; +import com.glxp.api.req.inout.FilterReceiveDetailRequest; +import com.glxp.api.res.inout.ReceiveDetailResponse; +import com.glxp.api.service.inout.ReceivedetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ReceiveDetailServiceImpl implements ReceivedetailService { + + @Resource + ReceiveDetailDao receiveDetailDao; + + @Override + public List filterList(FilterReceiveDetailRequest filterReceiveDetailRequest) { + if (null == filterReceiveDetailRequest) { + return Collections.emptyList(); + } + if (null != filterReceiveDetailRequest.getPage() && null != filterReceiveDetailRequest.getLimit()) { + PageHelper.offsetPage((filterReceiveDetailRequest.getPage() - 1) * filterReceiveDetailRequest.getLimit(), filterReceiveDetailRequest.getLimit()); + } + return receiveDetailDao.filterList(filterReceiveDetailRequest); + } + + @Override + public int insert(PurReceiveDetailEntity receiveDetailEntity) { + return receiveDetailDao.insert(receiveDetailEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java new file mode 100644 index 000000000..e43b6785a --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -0,0 +1,41 @@ +package com.glxp.api.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.ReceiveDao; +import com.glxp.api.entity.inout.PurReceiveEntity; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.res.inout.ReceiveResponse; +import com.glxp.api.service.inout.ReceiveService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ReceiveServiceImpl implements ReceiveService { + + @Resource + ReceiveDao receiveDao; + + @Override + public int insertOrder(PurReceiveEntity purReceiveEntity) { + return receiveDao.insert(purReceiveEntity); + } + + @Override + public int updateOrder(PurReceiveEntity purReceiveEntity) { + return receiveDao.updateById(purReceiveEntity); + } + + @Override + public List filterList(FilterReceiveRequest filterReceiveRequest) { + if (null == filterReceiveRequest) { + return Collections.emptyList(); + } + if (null != filterReceiveRequest.getPage() && null != filterReceiveRequest.getLimit()) { + PageHelper.offsetPage((filterReceiveRequest.getPage() - 1) * filterReceiveRequest.getLimit(), filterReceiveRequest.getLimit()); + } + return receiveDao.filterList(filterReceiveRequest); + } +} diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml new file mode 100644 index 000000000..db748dae1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -0,0 +1,42 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml new file mode 100644 index 000000000..6a75320bf --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml @@ -0,0 +1,21 @@ + + + + +