Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-27 5e82a52da8742dc157b4618c0c6c0d9156060c43

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -337,4 +337,15 @@
    public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.mergeFlowCard(object));
    }
    @ApiOperation("汉玻获取流程卡接口")
    @PostMapping("/getProcessCardList/hanbo")
    public Result getProcessCard() {
        return Result.seccess(flowCardService.getProcessCard());
    }

    @ApiOperation("汉玻确认接收接口")
    @PostMapping("/updateProcessCardState/hanbo")
    public Result updateProcessCardState(@RequestBody Integer id) {
        return Result.seccess(flowCardService.updateProcessCardState(id));
    }
}

 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java

@@ -56,6 +56,7 @@
    //分架员
    private String founder;
    //分架时间
    @TableField(value = "`splitFrame_time`")
    private LocalDate splitFrameTime;
    //排序
    private Integer sort;
@@ -66,12 +67,16 @@

    //查询用
    //报工编号
    @TableField(select = false,exist = false)
    private String reportingWorkId;
    //产品名称
    @TableField(select = false,exist = false)
    private String glassChild;
    //工艺流程
    @TableField(select = false,exist = false)
    private String process;
    //流程卡合并
    @TableField(select = false,exist = false)
    private Integer merge;

    //外键订单表

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java

@@ -35,6 +35,9 @@
    private LocalDate productionTime;
    private LocalDate createTime;

    @TableField(select = false,exist = false)
    private  Integer thickness;

   @TableField(select = false,exist = false)
    private  Order order;
    @TableField(select = false,exist = false)

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
@@ -680,6 +681,37 @@


    }

    public  List<FlowCard> getProcessCard() {
        List<FlowCard> flowCardList = flowCardMapper.selectList(
                new QueryWrapper<FlowCard>().eq("termination_status", 0)
                        .orderByDesc("id")
        );
        for (FlowCard flowCard : flowCardList) {
            flowCard.setProcessId(flowCard.getProcessId()+'/'+flowCard.getTechnologyNumber());
            flowCard.setOrderGlassDetail(
                    orderGlassDetailMapper.selectOne(
                            new QueryWrapper<OrderGlassDetail>()
                                    .eq("order_id", flowCard.getOrderId())
                                    .eq("order_number", flowCard.getOrderNumber())
                                    .eq("technology_number", flowCard.getTechnologyNumber())
                    )
            );
            String str = flowCard.getOrderGlassDetail().getGlassChild();
            String delimiter = "mm";
            int index = str.indexOf(delimiter);
            Integer subString = Integer.valueOf(str.substring(0, index).trim());
            flowCard.getOrderGlassDetail().setThickness(subString);
        }
        return flowCardList;
    }

    public Boolean updateProcessCardState(Integer id) {
        UpdateWrapper<FlowCard> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", id) // 根据id更新
                .set("termination_status", 1);
        return flowCardMapper.update(null, updateWrapper) > 0;
    }
}