中心仓-费用信息模块

blade-service-api/tire-center-warehouse-api/src/main/java/com/ecp/tire/center/warehouse/api/cost/dto/CenterCostDescDto.java

@@ -0,0 +1,13 @@
+package com.ecp.tire.center.warehouse.api.cost.dto;
+
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author Rain
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CenterCostDescDto extends CenterCostDesc {
+}

blade-service-api/tire-center-warehouse-api/src/main/java/com/ecp/tire/center/warehouse/api/cost/entity/CenterCostDesc.java

@@ -0,0 +1,115 @@
+package com.ecp.tire.center.warehouse.api.cost.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Rain
+ */
+@Data
+@TableName("center_cost_desc")
+public class CenterCostDesc {
+	/**
+	 * 主键ID
+	 */
+	private Long id;
+
+	/**
+	 * 费用编码
+	 */
+	@TableField("code")
+	private String code;
+
+	/**
+	 * 费用名称
+	 */
+	@TableField("c_name")
+	private String cname;
+
+	/**
+	 * 英文名称
+	 */
+	@TableField("e_name")
+	private String eName;
+
+	/**
+	 * 币别
+	 */
+	@TableField("fcy_no")
+	private String fcyNo;
+
+	/**
+	 * 计量单位
+	 */
+	@TableField("unit_no")
+	private String unitNo;
+
+	/**
+	 * 收付标识：D:收 C:付
+	 */
+	@TableField("dc")
+	private String dc;
+
+	/**
+	 * 备注
+	 */
+	@TableField("remarks")
+	private String remarks;
+
+	/**
+	 * 版本
+	 */
+	@TableField("version")
+	private Integer version;
+
+	/**
+	 * 租户ID
+	 */
+	@TableField("tenant_id")
+	private String tenantId;
+
+	/**
+	 * 创建人
+	 */
+	@TableField("create_user")
+	private Long createUser;
+
+	/**
+	 * 创建部门
+	 */
+	@TableField("create_dept")
+	private Long createDept;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField("create_time")
+	private Date createTime;
+
+	/**
+	 * 修改人
+	 */
+	@TableField("tenant_id")
+	private Long updateUser;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField("update_user")
+	private Date updateTime;
+
+	/**
+	 * 状态（0正常 1停用）
+	 */
+	@TableField("status")
+	private Integer status;
+
+	/**
+	 * 是否已删除（0否 1是）
+	 */
+	@TableField("is_deleted")
+	private Integer isDeleted;
+}

blade-service-api/tire-center-warehouse-api/src/main/java/com/ecp/tire/center/warehouse/api/cost/vo/CenterCostDescVo.java

@@ -0,0 +1,14 @@
+package com.ecp.tire.center.warehouse.api.cost.vo;
+
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author Rain
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CenterCostDescVo extends CenterCostDesc {
+
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/cost/controller/CenterCostDescController.java

@@ -0,0 +1,108 @@
+package com.ecp.tire.center.warehouse.cost.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+import com.ecp.tire.center.warehouse.api.cost.vo.CenterCostDescVo;
+import com.ecp.tire.center.warehouse.cost.service.ICenterCostDescService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @author Rain
+ */
+@RestController
+@RequestMapping("/tire/center/warehouse/costDesc")
+@AllArgsConstructor
+public class CenterCostDescController {
+
+	private final ICenterCostDescService centerCostDescService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入centerShipCost")
+	public R<CenterCostDesc> detail(CenterCostDescVo centerShipCost) {
+		CenterCostDesc detail = centerCostDescService.getOne(Condition.getQueryWrapper(centerShipCost));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 出入库费用表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入centerShipCost")
+	public R<IPage<CenterCostDesc>> list(CenterCostDescVo centerCostDescVo, Query query) {
+		IPage<CenterCostDesc> pages = centerCostDescService.page(Condition.getPage(query), Condition.getQueryWrapper(centerCostDescVo));
+		return R.data(pages);
+	}
+
+
+	/**
+	 * 新增 出入库费用表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入centerShipCost")
+	public R save(@Valid @RequestBody CenterCostDescVo centerCostDescVo) {
+		return R.status(centerCostDescService.save(centerCostDescVo));
+	}
+
+	/**
+	 * 修改 出入库费用表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入centerShipCost")
+	public R update(@Valid @RequestBody CenterCostDescVo centerCostDescVo) {
+		return R.status(centerCostDescService.updateById(centerCostDescVo));
+	}
+
+	/**
+	 * 新增或修改 出入库费用表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	public R submit(@Valid @RequestBody CenterCostDescVo centerCostDescVo) {
+		BladeUser bladeUser = AuthUtil.getUser();
+		if (Objects.isNull(centerCostDescVo.getId())) {
+			centerCostDescVo.setCreateUser(bladeUser.getUserId());
+			centerCostDescVo.setCreateDept(Long.valueOf(bladeUser.getDeptId()));
+			centerCostDescVo.setCreateTime(new Date());
+			centerCostDescVo.setVersion(1);
+		} else {
+			centerCostDescVo.setUpdateUser(bladeUser.getUserId());
+			centerCostDescVo.setUpdateTime(new Date());
+			centerCostDescVo.setVersion(centerCostDescVo.getVersion() + 1);
+		}
+		return R.status(centerCostDescService.saveOrUpdate(centerCostDescVo));
+	}
+
+
+	/**
+	 * 删除 出入库费用表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(centerCostDescService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/cost/imp/CenterCostDescServiceImpl.java

@@ -0,0 +1,14 @@
+package com.ecp.tire.center.warehouse.cost.imp;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+import com.ecp.tire.center.warehouse.cost.mapper.CenterCostDescMapper;
+import com.ecp.tire.center.warehouse.cost.service.ICenterCostDescService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Rain
+ */
+@Service
+public class CenterCostDescServiceImpl extends ServiceImpl<CenterCostDescMapper, CenterCostDesc> implements ICenterCostDescService {
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/cost/mapper/CenterCostDescMapper.java

@@ -0,0 +1,10 @@
+package com.ecp.tire.center.warehouse.cost.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+
+/**
+ * @author Rain
+ */
+public interface CenterCostDescMapper extends BaseMapper<CenterCostDesc> {
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/cost/mapper/CenterCostDescMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
+<mapper namespace="com.ecp.tire.center.warehouse.cost.mapper.CenterCostDescMapper">
+
+    <resultMap id="centerCostDescResultMap" type="com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc">
+        <id property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="cname" column="c_name"/>
+        <result property="eName" column="e_name"/>
+        <result property="fcyNo" column="fcy_no"/>
+        <result property="unitNo" column="unit_no"/>
+        <result property="dc" column="dc"/>
+        <result property="remarks" column="remarks"/>
+        <result property="version" column="version"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createUser" column="create_user"/>
+        <result property="createDept" column="create_dept"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateUser" column="update_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="isDeleted" column="is_deleted"/>
+    </resultMap>
+
+
+</mapper>

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/cost/service/ICenterCostDescService.java

@@ -0,0 +1,10 @@
+package com.ecp.tire.center.warehouse.cost.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ecp.tire.center.warehouse.api.cost.entity.CenterCostDesc;
+
+/**
+ * @author Rain
+ */
+public interface ICenterCostDescService extends IService<CenterCostDesc> {
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/stock/controller/CenterStockDescController.java

@@ -91,7 +91,7 @@ public class CenterStockDescController {
 		if ("0".equals(stockDesc.getWhether())) {
 			lambdaQueryWrapper.ne(CenterStockDesc::getBalanceQuantity, NumberEnum.Zero);
 		}
-		lambdaQueryWrapper.like(CenterStockDesc::getCname, stockDesc.getCname());
+		lambdaQueryWrapper.like(StringUtils.hasText(stockDesc.getCname()), CenterStockDesc::getCname, stockDesc.getCname());
 		List<CenterStockDesc> list = centerStockDescService.list(lambdaQueryWrapper);
 		BigDecimal balanceQuantity = list.stream().map(CenterStockDesc::getBalanceQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
 		BigDecimal inventoryAmount = list.stream().map(CenterStockDesc::getInventoryAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);