bug修改

无关风月

2025-02-14 569961440c33e90f57770f77e2c61e83dcc32139

bug修改

 common/src/main/java/com/jilongda/common/Ticket/TicketUtil.java

@@ -528,17 +528,6 @@
                        if (s.getStatus()==2){
                            content.append("配镜处方<BR>");
                            content.append("R:<BR>");
//                            (s.getAddS()==null?"-":s.getAddS())
//                            (s.getPupilDistance()==null?"-":s.getPupilDistance())
//
//                            (s.getCorrect()==null?"-":s.getCorrect())
//                            (s.getBallMirror()==null?"-":s.getBallMirror())
//                            (s.getColumnMirror()==null?"-":s.getColumnMirror())
//                            (s.getAxis()==null?"-":s.getAxis())
//                            (s.getAddS()==null?"-":s.getAddS())
//                            (s.getPupilDistance()==null?"-":s.getPupilDistance())
//                            (s.getPupilHeight()==null?"-":s.getPupilHeight())
//                            (s.getCorrect()==null?"-":s.getCorrect())
                            content.append("度数:"+(s.getBallMirror()==null?"-":s.getBallMirror())+" 散光:"+(s.getColumnMirror()==null?"-":s.getColumnMirror())+" 轴位:"+(s.getAxis()==null?"-":s.getAxis())+"<BR>");
                            content.append("ADD:"+(s.getAddS()==null?"-":s.getAddS())+" 瞳距:"+(s.getPupilDistance()==null?"-":s.getPupilDistance())+" 瞳高:"+(s.getPupilHeight()==null?"-":s.getPupilHeight())+"<BR>");
                            content.append("矫正:"+(s.getCorrect()==null?"-":s.getCorrect())+"<BR>");

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

@@ -47,6 +47,7 @@
    @PostMapping(value = "/add")
    public ApiResult<String> add(@RequestBody TLensSeries dto) {
        lensSeriesService.save(dto);
        // 生成库存
        return ApiResult.success();
    }
    @ApiOperation(value = "镜片系列编辑")

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

@@ -183,6 +183,8 @@
    }
    @Autowired
    private TTicketService tTicketService;
    @Autowired
    private TStoreService storeService;
    @ApiOperation(value = "添加订单")
    @PostMapping(value = "/addOrder")
    public ApiResult addOrder(@RequestBody TOrderDTO dto) {
@@ -412,6 +414,9 @@
            tOptometryDetailVOS.add(tOptometryDetailVO);
        }
        tAddOptometryVO.setOptometryDetailVOS(tOptometryDetailVOS);
        tAddOptometryVO.setShopName(storeService.getById(dto.getStoreId()).getName());
        System.err.println("加工单数据");
        System.err.println(tAddOptometryVO);
        if (dto.getIsMachining()==1){
            // 打印加工单
            TicketUtil.printMatch(tAddOptometryVO);

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

@@ -166,13 +166,13 @@
    @ApiOperation(value = "镜片出入库记录列表")
    @PostMapping(value = "/detailLensList")
    public ApiResult<PageInfo<TLensWarehousingDetailVO>> detailLensList(@RequestBody TWarehousingDetailLensQuery query) {
        if (StringUtils.hasLength(query.getSeries())){
        if (query.getSeriesId()!=null){
            TLensSeries series = lensSeriesService.getById(query.getSeriesId());
            if (series!=null){
                query.setSeries(series.getName());
            }
        }
        if (StringUtils.hasLength(query.getBrand())){
        if (query.getBrandId()!=null){
            TBrand brand = brandService.getById(query.getBrandId());
            if (brand!=null){
                query.setBrand(brand.getName());

 manage/src/main/java/com/jilongda/manage/model/TOptometryDetail.java

@@ -36,6 +36,17 @@
    @ApiModelProperty(value = "类型1配镜处方 2完全矫正 3旧镜信息")
    @TableField("type")
    private Integer type;
    @ApiModelProperty(value = "球镜")
    @TableField("ballMirror")
    private Double ballMirror;
    @ApiModelProperty(value = "柱镜")
    @TableField("columnMirror")
    private Double columnMirror;
    @ApiModelProperty(value = "轴位")
    @TableField("axis")
    private String axis;



    @ApiModelProperty(value = "验光单id")
    @TableField("optometryId")
@@ -45,17 +56,11 @@
    @TableField("orderId")
    private Integer orderId;

    @ApiModelProperty(value = "球镜")
    @TableField("ballMirror")
    private Double ballMirror;

    @ApiModelProperty(value = "柱镜")
    @TableField("columnMirror")
    private Double columnMirror;

    @ApiModelProperty(value = "轴位")
    @TableField("axis")
    private String axis;




    @ApiModelProperty(value = "addS")
    @TableField("addS")