bug修改

无关风月

2025-01-15 943af1e14662b88e64b4cdd16fec66e74bcb85da

bug修改

 manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java

@@ -32,7 +32,6 @@
@Slf4j
@Api(tags = "Ali-OSS文件上传接口")
@RestController
@CrossOrigin("*")
@RequestMapping("/ali-oss/")
public class AliOssManageFileUploadController {


 manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java

@@ -110,7 +110,7 @@
        return ApiResult.success(i);
    }
    @ApiOperation(value = "镜架-根据材质id查询对应库存")
    @GetMapping(value = "/getCountByMaterialId")
    @PostMapping(value = "/getCountByMaterialId")
    public ApiResult getCountByMaterialId(Integer id,Integer storeId) {
        List<Integer> collect = modelService.lambdaQuery().eq(TModel::getMaterialId, id)
                .list().stream().map(TModel::getId).distinct().collect(Collectors.toList());

 manage/src/main/java/com/jilongda/manage/controller/TOrderController.java

@@ -210,6 +210,9 @@
                String[] split = null;
                if(StringUtils.hasLength(rLens)){
                    split = rLens.split(",");
                    if (split.length == 1){

                    }
                }else {
                    split = orderGood.getLLens().split(",");
                }

 manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java

@@ -363,6 +363,10 @@
        List<TFrameWarehousingDetail> list = frameWarehousingDetailService.list(Wrappers.lambdaQuery(TFrameWarehousingDetail.class)
                .eq(TFrameWarehousingDetail::getWarehousingId, id));
        vo.setFrameWarehousingDetails(list);
        TStore store = storeService.getById(warehousing.getStoreId());
        if (store!=null){
            vo.setStoreName(store.getName());
        }
        // 统计数量
        vo.setTotalNum(list.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
        return ApiResult.success(vo);
@@ -375,6 +379,10 @@
        BeanUtils.copyProperties(warehousing, vo);
        List<TLensWarehousingDetail> list = lensWarehousingDetailService.list(Wrappers.lambdaQuery(TLensWarehousingDetail.class)
                .eq(TLensWarehousingDetail::getWarehousingId, id));
        TStore store = storeService.getById(warehousing.getStoreId());
        if (store!=null){
            vo.setStoreName(store.getName());
        }
        vo.setLensWarehousingDetails(list);
        // 统计数量
        vo.setTotalNum(list.stream().mapToInt(TLensWarehousingDetail::getTotal).sum());

 manage/src/main/resources/mapping/TLensGoods.xml

@@ -4,10 +4,22 @@


    <select id="lensReceiptList" resultType="com.jilongda.manage.vo.TLensGoodsVO">
        select t1.*,t2.name as series,t4.name as storeName,
        select t1.seriesId,
        t1.createTime,
        t1.updateTime,
        t1.createBy,
        t1.updateBy,
        t1.isDelete,
        t1.storeId,
        t1.ballMirror,
        t1.columnMirror,
        t1.refractiveIndex,
        t1.`status`,
        t1.lensType,t2.name as series,t4.name as storeName,
        t2.sphere as sphere,t2.asphericSurface as asphericSurface,t2.type as type
        ,t2.doubleNon as doubleNon
             ,t6.name as brand,t7.frameThreshold
             ,t6.name as brand,t7.frameThreshold,
              sum(t1.total) as total
        from
        t_lens_goods t1
        left join t_lens_series t2 on t1.seriesId=t2.id
@@ -39,9 +51,12 @@
            <if test="query.isWarning !=null and query.isWarning ==2">
                and t1.total >= t7.lensThreshold
            </if>

            and t1.isDelete =  0
        </where>
        group by
        seriesId,
        refractiveIndex,
        lensType
        order by t1.id
    </select>
</mapper>