检验下单移植

zhuo

2025-02-18 bd1137319f16fcb2750333aeb37366aff0ec4ef9

 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java

@@ -51,13 +51,13 @@

    @ApiOperation(value = "原材料检验查询检验中")
    @GetMapping("/getIfsByStateOne")
    public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto) throws Exception {
    public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto){
        return Result.success(rawMaterialOrderService.getIfsByStateOne(page, ifsInventoryQuantityDto));
    }

    @ApiOperation(value = "原材料检验查询已检验")
    @GetMapping("/getIfsByOver")
    public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
    public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
    }

@@ -79,7 +79,7 @@
    }

    @ApiOperation(value = "删除原材料检验单模板")
    @PostMapping("/delRawMaterOrderTemplate")
    @DeleteMapping("/delRawMaterOrderTemplate")
    public Result<?> delRawMaterOrderTemplate(Integer id) {
        return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
    }
@@ -99,12 +99,13 @@

    /**
     * 取消报检
     * @param id 原材料下单
     * @param param 原材料下单
     * @return
     */
    @ApiOperation(value = "撤销报检")
    @PostMapping("/revokeInspectionReport")
    public Result<?> revokeInspectionReport(Integer id) {
    public Result<?> revokeInspectionReport(@RequestBody Map<String, Object> param) {
        Integer id = (Integer) param.get("id");
        return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
    }

@@ -145,12 +146,13 @@

    /**
     * 原材料撤销
     * @param ifsInventoryId
     * @param param
     * @return
     */
    @ApiOperation(value = "原材料撤销下单")
    @PutMapping("/repealRawOrder")
    public Result<?> repealRawOrder(Integer ifsInventoryId){
    @GetMapping("/repealRawOrder")
    public Result<?> repealRawOrder(@RequestBody Map<String, Object> param){
        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
        return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
    }

@@ -167,10 +169,8 @@


    @ApiOperation(value = "仓库报检查询")
    @PostMapping("/getWarehouseSubmit")
    public Result getWarehouseSubmit(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        IfsInventoryQuantity ifsInventoryQuantity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantity.class);
    @GetMapping("/getWarehouseSubmit")
    public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
        return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
    }

@@ -180,7 +180,7 @@
     * @return
     */
    @ApiOperation(value = "删除原材料报检信息")
    @PostMapping("/delIfsInventory")
    @DeleteMapping("/delIfsInventory")
    public Result<?> delIfsInventory(Integer id) {
        return Result.success(rawMaterialOrderService.delIfsInventory(id));
    }
@@ -211,10 +211,8 @@


    @ApiOperation(value = "原材料报检查询全部")
    @PostMapping("/getIfsByAll")
    public Result getIfsByAll(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
    @GetMapping("/getIfsByAll")
    public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
    }

@@ -227,19 +225,10 @@
    }

    @ApiOperation(value = "原材料下单查看已完成信息")
    @PostMapping("/getIfsByFinish")
    public Result getIfsByFinish(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
    @GetMapping("/getIfsByFinish")
    public Result getIfsByFinish(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
        ifsInventoryQuantityDto.setIsFinish(1);
        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
    }

    @ApiOperation(value = "测试移库")
    @PostMapping("/shiftingParking")
    public Result shiftingParking(@RequestBody List<Integer> ids){
        rawMaterialOrderService.shiftingParking(ids);
        return Result.success();
    }

    @ApiOperation(value = "微信发送文件测试")
@@ -261,41 +250,43 @@

    /**
     * 让步放行
     * @param ifsInventoryId
     * @param param
     * @return
     */
    @ApiOperation(value = "让步放行")
    @PostMapping("/concessionRelease")
    public Result<?> concessionRelease(Integer ifsInventoryId){
    public Result<?> concessionRelease(@RequestBody Map<String, Object> param){
        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
        return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
    }

    /**
     * 原材料进厂撤销下单
     * @param enterOrderId
     * @param param
     * @return
     */
    @ApiOperation(value = "原材料进厂撤销下单")
    @PostMapping("/repealEnterRawOrder")
    public Result<?> repealEnterRawOrder(Integer enterOrderId){
    public Result<?> repealEnterRawOrder(@RequestBody Map<String, Object> param){
        Integer enterOrderId = (Integer) param.get("enterOrderId");
        return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
    }

    /**
     * 原材料季度撤销下单
     * @param quarterOrderId
     * @param param
     * @return
     */
    @ApiOperation(value = "原材料季度撤销下单")
    @PostMapping("/repealQuarterRawOrder")
    public Result<?> repealQuarterRawOrder(Integer quarterOrderId){
    public Result<?> repealQuarterRawOrder(@RequestBody Map<String, Object> param){
        Integer quarterOrderId = (Integer) param.get("quarterOrderId");
        return Result.success(rawMaterialOrderService.repealQuarterRawOrder(quarterOrderId));
    }

    @ApiOperation(value = "全部信息导出")
    @PostMapping("/rawAllExport")
    public void rawAllExport(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
        IfsInventoryQuantitySupplierDto dto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
    @GetMapping("/rawAllExport")
    public void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws Exception {
        rawMaterialOrderService.rawAllExport(dto,response);
    }

@@ -307,12 +298,13 @@

    /**
     * 提前入库
     * @param ifsInventoryId
     * @param param
     * @return
     */
    @ApiOperation(value = "提前入库")
    @PostMapping("/advancedGodown")
    public Result<?> advancedGodown(Integer ifsInventoryId){
    public Result<?> advancedGodown(@RequestBody Map<String, Object> param){
        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
        return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
    }