From 7e91801a5934806671c167b24ad31bf8a1755799 Mon Sep 17 00:00:00 2001 From: ZhangYingJie Date: Fri, 18 Apr 2025 17:23:56 +0800 Subject: [PATCH] dev --- .../server/controller/BaseController.java | 13 ----- .../inventory/InventoryController.java | 37 ++++++++++++ .../entity/inventory/InventoryGoodsView.java | 58 +++++++++++++++++++ .../inventory/InventoryPurchaseService.java | 39 ++++++------- .../service/inventory/InventoryService.java | 5 +- 5 files changed, 114 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryGoodsView.java diff --git a/src/main/java/com/syjiaer/clinic/server/controller/BaseController.java b/src/main/java/com/syjiaer/clinic/server/controller/BaseController.java index 2b70d24..4f319dd 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/BaseController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/BaseController.java @@ -1,28 +1,15 @@ package com.syjiaer.clinic.server.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.IService; -import com.syjiaer.clinic.server.common.exception.VerifyException; import com.syjiaer.clinic.server.common.util.HeadersUtil; import com.syjiaer.clinic.server.common.util.InfoUtil; import com.syjiaer.clinic.server.common.util.ParmsUtil; -import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; -import com.syjiaer.clinic.server.entity.manager.ManagerUser; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jws; -import io.jsonwebtoken.JwtException; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import java.time.format.DateTimeFormatter; -import java.util.List; import java.util.Map; public abstract class BaseController { diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java new file mode 100644 index 0000000..dbfdb94 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java @@ -0,0 +1,37 @@ +package com.syjiaer.clinic.server.controller.inventory; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.inventory.Inventory; +import com.syjiaer.clinic.server.service.goods.GoodsService; +import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService; +import com.syjiaer.clinic.server.service.inventory.InventoryService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/inventory/goods") +public class InventoryController extends BaseController { + @Autowired + private GoodsService iGoodsService; + @Autowired + private InventoryPurchaseService iInventoryPurchaseService; + @Autowired + private InventoryService iInventoryService; + /** + *根据采购单code 获取采购单信息 + */ + @RequestMapping("/listByOrderCode") + public Result> listByOrderCode() { + String orderCode = parmsUtil.getString("orderCode", "请输入订单号"); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("inventory_purchase_code", orderCode); + return success(iInventoryService.list(queryWrapper)); + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryGoodsView.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryGoodsView.java new file mode 100644 index 0000000..d0d0b2e --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryGoodsView.java @@ -0,0 +1,58 @@ +package com.syjiaer.clinic.server.entity.inventory; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author NiuZiYuan + * @since 2025-03-10 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("inventory_goods_view") +@ApiModel(value = "InventoryGoodsView对象", description = "") +public class InventoryGoodsView implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + + private Integer wholeNumber; + + private Integer fragmentNumber; + + private BigDecimal purchaseUnitPrice; + + private LocalDateTime createDatetime; + + private String inventoryPurchaseCode; + + private Integer goodId; + + private String packagingUnit; + + private LocalDate productionDate; + + private LocalDate expiryDate; + + private String name; + + private String productionBatchCode; + + private BigDecimal unitPrice; +} diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java index 89107fa..3a8cf43 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java @@ -20,7 +20,9 @@ import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class InventoryPurchaseService { @@ -31,6 +33,8 @@ public class InventoryPurchaseService { @Autowired private InventoryMapper inventoryMapper; @Autowired + private InventoryService inventoryService; + @Autowired private InventoryLogMapper inventoryLogMapper; @Autowired private InventoryInitMapper inventoryInitMapper; @@ -38,6 +42,11 @@ public class InventoryPurchaseService { private InventoryPurchaseMapper inventoryPurchaseMapper; @Autowired private InventoryPurchaseLogMapper inventoryPurchaseLogMapper; + /* + * 创建采购订单 + * @param inventoryPurchase 采购订单 + * @param list 采购项 + */ public void create(InventoryPurchase inventoryPurchase, List list) { if (inventoryPurchase.getInvoiceCode() == null || inventoryPurchase.getInvoiceCode().isEmpty()) { inventoryPurchase.setInvoiceCode("无"); @@ -52,6 +61,11 @@ public class InventoryPurchaseService { } createOrder(inventoryPurchase, list); } + /* + * 创建采购订单 + * @param inventoryOrder 采购订单 + * @param list 采购项 + */ public void createOrder(InventoryPurchase inventoryOrder, List list) { //构造订单 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -152,27 +166,10 @@ public class InventoryPurchaseService { goodsService.updateInventoryInfoById(inventory.getGoodId()); } } -// public Page<> list(int pageNum, int pageSize) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (query.getPageNum() == null || query.getPageNum() == 0) { -// query.setPageNum(1); -// } -// if (query.getPageSize() == null || query.getPageSize() == 0) { -// query.setPageSize(Constants.DetailPageSize); -// } -// long totalCount = iInventoryPurchaseViewService.count(queryWrapper); -// int totalPage = (int) Math.ceil((double) totalCount / query.getPageSize()); -// int offset = (query.getPageNum() - 1) * query.getPageSize(); -// Integer limit = query.getPageSize(); -// queryWrapper.orderByDesc("create_datetime"); -// queryWrapper.last("limit " + limit + " offset " + offset); -// Page page = new Page(); -// page.setTotal_count(totalCount); -// page.setTotal_page(totalPage); -// List InventoryPurchaseView = iInventoryPurchaseViewService.list(queryWrapper); -// page.setList(InventoryPurchaseView); -// return success(page); -// } + /* + * 创建采购订单 + * @param inventory 库存信息 + */ public void addOneGoods(Inventory inventory) { QueryWrapper orderWrapper = new QueryWrapper(); orderWrapper.eq("code", inventory.getInventoryPurchaseCode()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 8d9b973..1986d64 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -11,10 +11,7 @@ import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.entity.goods.Goods; -import com.syjiaer.clinic.server.entity.inventory.Inventory; -import com.syjiaer.clinic.server.entity.inventory.InventoryLog; -import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase; -import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog; +import com.syjiaer.clinic.server.entity.inventory.*; import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryLogMapper;