热处理报工优化

cuilei

2 天以前 32863d68c09f45cd501fd3db59c7f13e57130fe4

热处理报工优化

 src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java

@@ -153,6 +153,10 @@
    /**产线名称*/
    @TableField(exist = false)
    private String factoryName;
    /**产线类型*/
    @TableField(exist = false)
    @Dict(dicCode = "production_type")
    private String productionType;
    /**班组名称*/
    @TableField(exist = false)
    private String groupName;

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml

@@ -8,6 +8,7 @@
            t1.work_order_code AS text,
            t1.id AS value,
            t2.factory_code factoryCode,
            t2.production_type productionType,
            t3.shift_code shiftCode
        FROM mes_production_work_order t1
        LEFT JOIN base_factory t2 ON t1.factory_id = t2.id

 src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java

@@ -205,8 +205,9 @@
                .eq(LswMaterialInventory::getWarehouseId, lineSideWarehouse.getId())
                .eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.OUTBOUND.name())
                .eq(LswMaterialInventory::getHeatTreatmentFlag, CommonConstant.STATUS_0)
                .apply("EXISTS SELECT 1 FROM lsw_material t WHERE t.id = lsw_material_inventory.material_id AND t.material_number = {0} " +
                        "AND t.del_flag = {1} AND t.material_status = {2}", workOrder.getMaterialNumber(), CommonConstant.DEL_FLAG_0, CommonConstant.STATUS_1)).stream().findFirst().orElse(null);
                .apply("EXISTS (SELECT 1 FROM lsw_material t WHERE t.id = lsw_material_inventory.material_id AND t.material_number = {0} " +
                        "AND t.del_flag = {1} AND t.material_status = {2})", workOrder.getMaterialNumber(), CommonConstant.DEL_FLAG_0, CommonConstant.STATUS_1))
                .stream().findFirst().orElse(null);
        if (materialInventory == null) {
            throw new JeecgBootException("线边库无该物料库存信息！");
        }