From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java | 131 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java b/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
index a5c7a3e..e3ef7c1 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
@@ -1,13 +1,21 @@
package com.jilongda.manage.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
-import com.jilongda.manage.model.TLensSeries;
-import com.jilongda.manage.model.TOptometrist;
+import com.jilongda.manage.dto.TAddWarehousingLensDTO;
+import com.jilongda.manage.dto.TLensWarehousingDetailDTO;
+import com.jilongda.manage.dto.TWarehousingLensDTO;
+import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.query.TOptometristQuery;
+import com.jilongda.manage.service.TLensGoodsService;
import com.jilongda.manage.service.TLensSeriesService;
+import com.jilongda.manage.service.TLensWarehousingDetailService;
+import com.jilongda.manage.service.TWarehousingService;
import com.jilongda.manage.vo.TLensSeriesVO;
import com.jilongda.manage.vo.TOptometristVO;
import io.swagger.annotations.Api;
@@ -15,6 +23,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -30,6 +43,10 @@
public class TLensSeriesController {
@Autowired
private TLensSeriesService lensSeriesService;
+ @Autowired
+ private TWarehousingService warehousingService;
+ @Autowired
+ private TLensWarehousingDetailService lensWarehousingDetailService;
@ApiOperation(value = "镜片系列列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TLensSeriesVO>> pageList(@RequestBody TLensSeriesQuery query) {
@@ -41,6 +58,50 @@
public ApiResult<String> add(@RequestBody TLensSeries dto) {
lensSeriesService.save(dto);
return ApiResult.success();
+ }
+ @Autowired
+ private TLensGoodsService lensGoodsService;
+ @ApiOperation(value = "镜片系列生成库存")
+ @PostMapping(value = "/addGoods")
+ public ApiResult<String> addGoods(@RequestBody TAddWarehousingLensDTO dto) {
+ List<TLensGoods> list = lensGoodsService.lambdaQuery().list();
+ List<TLensWarehousingDetailDTO> tLensWarehousingDetail = dto.getLensWarehousingDetails();
+ List<TLensSeries> lensSeries = lensSeriesService.list();
+ List<TLensGoods> tLensGoods = new ArrayList<>();
+ for (TLensWarehousingDetailDTO frameWarehousingDetail : tLensWarehousingDetail) {
+ TLensSeries series = lensSeries.stream().filter(e -> e.getId().equals(frameWarehousingDetail.getSeriesId())).findFirst().orElse(null);
+ if (series!=null){
+ double endBallCondition =0.00;
+ double endColumnCondition =0.00;
+ TLensGoods tLensGoods1 = list.stream().filter(e -> e.getSeriesId().equals(frameWarehousingDetail.getSeriesId()) &&
+ e.getRefractiveIndex().equals(frameWarehousingDetail.getRefractiveIndex())
+ && e.getLensType().equals(frameWarehousingDetail.getType())
+ && e.getBallMirror().equals(endBallCondition+"")
+ && e.getColumnMirror().equals(endColumnCondition+"")).findFirst().orElse(null);
+ if (tLensGoods1==null){
+ // 新增
+ TLensGoods tFrameGoods = new TLensGoods();
+ tFrameGoods.setStatus(1);
+ tFrameGoods.setLensType(frameWarehousingDetail.getType());
+ tFrameGoods.setSeriesId(frameWarehousingDetail.getSeriesId());
+ tFrameGoods.setBallMirror(String.format("%.2f",endBallCondition));
+ tFrameGoods.setColumnMirror(String.format("%.2f",endColumnCondition));
+ tFrameGoods.setRefractiveIndex(frameWarehousingDetail.getRefractiveIndex());
+ tFrameGoods.setTotal(0);
+ tFrameGoods.setStoreId(dto.getStoreId());
+ tLensGoods.add(tFrameGoods);
+ }
+ }
+ }
+ lensGoodsService.saveBatch(tLensGoods);
+ return ApiResult.success();
+ }
+
+ public static void main(String[] args) {
+ double temp = -0.25;
+ System.err.println(temp-0.25);
+
+ System.err.println(String.format("%.2f",temp-0.25));
}
@ApiOperation(value = "镜片系列编辑")
@PostMapping(value = "/update")
@@ -69,5 +130,71 @@
lensSeriesService.updateById(byId);
return ApiResult.success();
}
+ @ApiOperation(value = "通过品牌id查询镜片系列列表")
+ @GetMapping(value = "/seriesList")
+ public ApiResult<List<TLensSeries>> seriesList(Integer brandId) {
+ return ApiResult.success(lensSeriesService.lambdaQuery().eq(TLensSeries::getBrandId,brandId).list());
+ }
+ @ApiOperation(value = "通过品牌id查询镜片系列列表-添加销售订单用 过滤没有生成库存的系列")
+ @GetMapping(value = "/seriesListOrder")
+ public ApiResult<List<TLensSeries>> seriesListOrder(Integer brandId) {
+ List<TLensGoods> list = lensGoodsService.lambdaQuery().list();
+ List<Integer> collect = list.stream().map(TLensGoods::getSeriesId).distinct().collect(Collectors.toList());
+ if (list.isEmpty()){
+ return ApiResult.success(new ArrayList<TLensSeries>());
+ }
+ List<TLensSeries> lensSeries = lensSeriesService.lambdaQuery().eq(TLensSeries::getBrandId, brandId)
+ .in(TLensSeries::getId,collect).list();
+ return ApiResult.success(lensSeries);
+ }
+ @ApiOperation(value = "通过系列id查询球/非球 返回参数1为球 2非球 3双飞")
+ @GetMapping(value = "/lensTypeList")
+ public ApiResult<List<Integer>> lensTypeList(Integer id) {
+ TLensSeries byId = lensSeriesService.getById(id);
+ List<Integer> integers = new ArrayList<>();
+ if (StringUtils.hasLength(byId.getSphere())){
+ integers.add(1);
+ }
+ if (StringUtils.hasLength(byId.getAsphericSurface())){
+ integers.add(2);
+ }
+ if (StringUtils.hasLength(byId.getDoubleNon())){
+ integers.add(3);
+ }
+ return ApiResult.success(integers);
+ }
+ @ApiOperation(value = "根据系列id + 球/非球查询折射率列表 球/非球入参数1为球 2非球 3双飞")
+ @GetMapping(value = "/refractiveIndexList")
+ public ApiResult<JSONArray> refractiveIndexList(Integer id, Integer lensType) {
+ TLensSeries byId = lensSeriesService.getById(id);
+ JSONArray jsonArray = null;
+ if (lensType==1){
+ String sphere = byId.getSphere();
+ // 将字符串化为jsonArray
+ if (StringUtils.hasLength(sphere)) {
+ jsonArray = JSONObject.parseArray(sphere);
+ } else {
+ return ApiResult.success(new JSONArray());
+ }
+ }
+ if (lensType==2){
+ String asphericSurface = byId.getAsphericSurface();
+ if (StringUtils.hasLength(asphericSurface)) {
+ jsonArray = JSONObject.parseArray(asphericSurface);
+ } else {
+ return ApiResult.success(new JSONArray());
+ }
+ }
+ if (lensType==3){
+ String doubleNon = byId.getDoubleNon();
+ if (StringUtils.hasLength(doubleNon)) {
+ jsonArray = JSONObject.parseArray(doubleNon);
+ } else {
+ return ApiResult.success(new JSONArray());
+ }
+ }
+
+ return ApiResult.success(jsonArray);
+ }
}
--
Gitblit v1.7.1