Merge remote-tracking branch 'origin/master'

YYC

2023-06-30 8bba7f03df59c7689dbb64a952a63944a1f43ade

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutReportController.java

@@ -3,6 +3,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutCheckData;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.manager.InoutReportManager;
import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Date;

/**
@@ -21,7 +23,7 @@
@RequestMapping("basic/inout/report")
public class InoutReportController {

    @Autowired
    @Resource
    private InoutReportManager reportManager;


@@ -49,4 +51,28 @@
                    "后台异常：" + e.getMessage());
        }
    }


    /**
     * 打印扦样单
     *
     * @param data
     * @return
     */
    @RequestMapping("/bill-simple")
    public PageResponse<String> simpleBill(@RequestBody InoutCheckData data) {
        try {
            String html = reportManager.simpleBill(data);
            if (null == html) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                        "生成打印码失败");
            }

            return new PageResponse<>(RespCodeEnum.CODE_0000, html);
        } catch (Exception e) {
            log.error("后台异常:{}", e);
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "后台异常：" + e.getMessage());
        }
    }
}